From: Ajay Panicker <apanicke@google.com>
Date: Wed, 21 Sep 2016 02:05:37 +0000 (+0000)
Subject: Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668f... 
X-Git-Tag: android-7.1.2_r17~20^2~9^2^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1dc58005538a96917ae8120ad86957d4570e421f;p=android-x86%2Fpackages-apps-Bluetooth.git

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am: 3ccc668ff8 am: 2c3e8b5898 am: 77a38cb641  -s ours" into lmp-dev am: 60b2ea959d  -s ours am: fcc8d6c900 am: 64998914de am: 0d4475fc01  -s ours
am: 5c950df332

Change-Id: Iabd73bf8da9e82107f8825724bb03bfb7bce233a
---

1dc58005538a96917ae8120ad86957d4570e421f