tree 71d9050a0e8db324ffa4e810005bf4a2e2253caa
parent e04b73c9a79b005febac2e52b2b651f3ae54552e
parent 3ba71171647ae1d2366490efac4de5edf10b3707
author Jeff Sharkey <jsharkey@google.com> 1493664192 +0000
committer android-build-merger <android-build-merger@google.com> 1493664192 +0000

Merge "Updates based on API council guidance." into oc-dev
am: 3ba7117164

Change-Id: I75953e083e10972dcc44c431ff84bf3977e8d442