OSDN Git Service

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
authorAjay Panicker <apanicke@google.com>
Wed, 21 Sep 2016 04:14:36 +0000 (04:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Sep 2016 04:14:36 +0000 (04:14 +0000)
commit585b49b657f060873a43e64c7cfb547b9a929ec3
tree9083de2ca005eb4c04872a414fe325ebfbba5589
parent91a29a46c769452578456ce1fc3aea4969a014ee
parentfd4fdc208637f77fb2ff8e85faa7c7597f96c569
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641  -s ours" into lmp-dev am: 60b2ea959d  -s ours am: fcc8d6c900 am: 64998914de am: 0d4475fc01  -s ours am: 5c950df332 am: 1dc5800553 am: e45190af67 am: 72c9d444c3  -s ours
am: fd4fdc2086

Change-Id: Ie1f9aab57f23ef266f6ef4be50bd5db7b13286bc