tree 9e013d44284c5f9f61baf5fc426b5030533774c4
parent 5d2069d9dcac74dc8dcd386e4d89dbb09cc59546
parent 5c950df332b41b9b4d3b9aa87a19e362752fe444
author Ajay Panicker <apanicke@google.com> 1474423537 +0000
committer android-build-merger <android-build-merger@google.com> 1474423537 +0000

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

Change-Id: Iabd73bf8da9e82107f8825724bb03bfb7bce233a