tree 927704650d765a876896893b3e20279ccd4875ef
parent 87724fc002d972e07867f49c05ba097918be0965
parent 3a5adcdcaff572cfe0a65d7cdc2a205e4cb68369
author David Brazdil <dbrazdil@google.com> 1525862918 -0700
committer android-build-merger <android-build-merger@google.com> 1525862918 -0700

[automerger skipped] Merge changes from topic "hiddenapi-cherrypick" am: 4972754f23
am: 3a5adcdcaf  -s ours

Change-Id: I82b104f5cefe643d3af2f5b37aaa2377e2245a90