OSDN Git Service

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp...
authorAjay Panicker <apanicke@google.com>
Wed, 21 Sep 2016 02:37:40 +0000 (02:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Sep 2016 02:37:40 +0000 (02:37 +0000)
commit8eb38035db429d8ef66046209f3e325bb1f1d875
tree9e013d44284c5f9f61baf5fc426b5030533774c4
parentb8b865d786030cfcda0c79ce0d2b2c54ee6af04d
parent8305951ccaceec41d9ed1be313e8edaf28c45af2
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642 am: 5bc4962e53  -s ours
am: 8305951cca

Change-Id: I92d2761c392537a1e49a5392e224c1809b311f98