OSDN Git Service

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp...
authorAjay Panicker <apanicke@google.com>
Wed, 21 Sep 2016 00:12:20 +0000 (00:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Sep 2016 00:12:20 +0000 (00:12 +0000)
am: 4f77ca16e4  -s ours

Change-Id: I6be29367b410ffc98e61d49450bb1d9905fbf3f8


Trivial merge