tree 9d7111f20a47968afaaf07719b65fd3bc4eb36e1
parent a33da80306f06c3227ffd985baa33e74d8f30047
parent d9421e77589f5e24b8ac3a000b76ae546a375141
author Ajay Panicker <apanicke@google.com> 1474431266 +0000
committer android-build-merger <android-build-merger@google.com> 1474431266 +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: d9421e7758

Change-Id: Ifd0e426285b9242ed9b0a1c3f72d82bad8fc9e02