tree 450f41da98e8c59d472e68c35de0076b39f79334
parent d46605ab09be02df5c61351610b93eab63089dd0
parent 2ef2d90eaaaf2c4aea04d4e8cbd5cca20b47bb53
author Ajay Panicker <apanicke@google.com> 1474423367 +0000
committer android-build-merger <android-build-merger@google.com> 1474423367 +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

Change-Id: Iff03e10920f3d42246b7b7e2c172ac30b3beaccb