tree 169df3befa21415b7c9bfebc228e78afb7dcbe06
parent 460561cb28c7ff6754c88f692d35cae6f6f6d964
parent 56fc3a7642e8e00619a07d065d646baa1a6fbf21
author Ajay Panicker <apanicke@google.com> 1474423231 +0000
committer android-build-merger <android-build-merger@google.com> 1474423231 +0000

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am: 0ccca8ac62
am: 56fc3a7642

Change-Id: Ief8c3e89f7c31045239e6f60d801a30525a68874