tree 4d09d114c5c0be70135a349559196388cf9a9d90
parent ff6037b771a8df3c318eb385f5b607f7fe991670
parent d9eeee5706d1a22f58e2b10f8a264f88d8728ddb
author George Mount <mount@google.com> 1493303120 +0000
committer android-build-merger <android-build-merger@google.com> 1493303120 +0000

Merge "Address API council feedback." into oc-dev am: b943736ca0
am: d9eeee5706

Change-Id: Ic57c35049eeb2ef489cca1bde6bcb2267efde385