tree 5e6449d77e64cba9c287484bec0563ddbeefa1a2
parent 834f982c979364dd34e855ea6a6bbdff877bd119
parent 3e238e33968af25df7d1028725b51cca2995c095
author Ajay Panicker <apanicke@google.com> 1474427600 +0000
committer android-build-merger <android-build-merger@google.com> 1474427600 +0000

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev am: 204da8aa9e am: a278a1e660 am: 3d995d6f5f  -s ours am: 4f77ca16e4  -s ours am: 959b1aa5b9 am: 7caccc107f am: 1dcec33349  -s ours am: 2ef2d90eaa am: b2e8361c50 am: c147db7a79
am: 3e238e3396  -s ours

Change-Id: I52e1cfccc31b8169eaeb4e4aacc67b97b0e39cec