tree ff66a753d222fc552ea0c2a0543a7f9325fbd9b0
parent 11159d15ed1294a202c041544d21ed795eb6b70f
parent fda1152e597179894aa4b57e125b46955ea92152
author Lucas Dupin <dupin@google.com> 1502940274 +0000
committer android-build-merger <android-build-merger@google.com> 1502940274 +0000

Merge "API Council feedback" into oc-mr1-dev am: 07c83d00c9
am: fda1152e59

Change-Id: I056fbfc35e8523f50c6194ce4b80e70eb17b8aee