tree 8e774cf9bef17261b8d31ef9b3cae72e2e30cf96
parent 93a622150f4ae413ade0528a539f0586707c6e7b
parent c147db7a79aac7af51b4fda3fcd8735c47306eb3
author Ajay Panicker <apanicke@google.com> 1474425536 +0000
committer android-build-merger <android-build-merger@google.com> 1474425536 +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

Change-Id: I52a9da62a72e21a052561b8aa1760bedb8a4b8c6