tree bba2001f88ff5b42d247e5f1a2a5ee4c4975a13e
parent 245bcda2c6eb7db8aab4cd0b62d0f6aafbdd2e44
parent e13d60764cc90406c75bf1641c9d5a7cc3e265ea
author Jeff Sharkey <jsharkey@google.com> 1493664743 +0000
committer android-build-merger <android-build-merger@google.com> 1493664743 +0000

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

Change-Id: Ib0a727b11cc24c20d10adf9df85df100f603a87f