OSDN Git Service

[automerger skipped] DO NOT MERGE Give PBAP permission only after user confirms am...
authorHansong Zhang <hsz@google.com>
Wed, 30 May 2018 20:41:41 +0000 (13:41 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 May 2018 20:41:41 +0000 (13:41 -0700)
am: 7cc441bf2f  -s ours

Change-Id: I19de0cbe315d298550edfb85039fbc87c42e6dc6


Trivial merge