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)
commit959b1aa5b9297bcb006e809cd34d61ae7d423017
treefc8ba572551442958b2765e06f5f463380f926fa
parentfafa73a8acee5d8c25fc3362276b8e740c374db3
parent4f77ca16e4ea9c319d713d1e765247983885a4f7
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f  -s ours
am: 4f77ca16e4  -s ours

Change-Id: I6be29367b410ffc98e61d49450bb1d9905fbf3f8