OSDN Git Service

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f...
authorAjay Panicker <apanicke@google.com>
Wed, 21 Sep 2016 06:04:49 +0000 (06:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Sep 2016 06:04:49 +0000 (06:04 +0000)
commit0eca4989212f0a962cc014cdfeabae24226e4bc8
tree29d630699cc2f3fdc8d9fe8011972bec678b7282
parentbe2dc70905c871fbe7fd0bf43367df62357d4360
parentf319b3c15f5bef84e7fde47bd4ae97c03b2438f2
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 am: 585b49b657
am: f319b3c15f

Change-Id: Ib09f2df08fc4649c8d1da95bba1ed1c20d6f80f9