OSDN Git Service

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp...
authorAjay Panicker <apanicke@google.com>
Wed, 21 Sep 2016 05:42:19 +0000 (05:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Sep 2016 05:42:19 +0000 (05:42 +0000)
commit6bdeca6be2e4d41a7c397cf6859de8d8a17098c2
tree66bec08abcbc0a1b9e4cdf26c27fda40e701dee9
parent8214d20dea87d176850ea714f1cca091fce1db46
parentbee9046a6b88c980c0a5c26e91a5dffccf1d4b12
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642 am: 5bc4962e53  -s ours am: 8305951cca am: 8eb38035db am: 1bd3e02a8a am: 3998910222  -s ours am: 1981d50808
am: bee9046a6b

Change-Id: Ib386994982f2ece85c8e727ce67a6fb30e6ab07a