OSDN Git Service

[automerger skipped] Merge changes from topic "hiddenapi-cherrypick" am: b54f2acc72...
authorDavid Brazdil <dbrazdil@google.com>
Wed, 9 May 2018 12:10:37 +0000 (05:10 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 May 2018 12:10:37 +0000 (05:10 -0700)
commitae961d877c9ddb1210b02a6bbcb46457f512dbda
tree872b5206243c17d43f18da7f3b6be63a3d2bc0dc
parentc19786abe9c63fcc7645ba2d89908a3494354052
parent0baa57d1cbf31b1e6abfc4a44460b25d7515f051
[automerger skipped] Merge changes from topic "hiddenapi-cherrypick" am: b54f2acc72 am: e88607ed9d  -s ours
am: 0baa57d1cb  -s ours

Change-Id: I2481c66627ac922e47b22cae4d3fd58a61e871aa