OSDN Git Service

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

Change-Id: Id0fe233f9b700c7b41fe864699b54727108b6ecf


Trivial merge