OSDN Git Service

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp...
authorAjay Panicker <apanicke@google.com>
Wed, 21 Sep 2016 03:27:34 +0000 (03:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Sep 2016 03:27:34 +0000 (03:27 +0000)
am: 3998910222  -s ours

Change-Id: I70bfe58ce090142cca39f7a7a4392ede22233420


Trivial merge