tree 3e4c43275c12c5f7ea40ad0ab975a35a2f59af9a
parent 7b1071b35b4144a7318cf891c4a6267b3f0dcc4a
parent 04ff2b888b6bc0cbd9646e2deeb84bdf43703dac
author Ajay Panicker <apanicke@google.com> 1474431162 +0000
committer android-build-merger <android-build-merger@google.com> 1474431162 +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 am: 998001b4b2
am: 04ff2b888b

Change-Id: Id379950f8915de393c76d1a8af498323eecb8a98