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

Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am: 0ccca8ac62 am: 56fc3a7642 am: 5bc4962e53  -s ours am: 8305951cca am: 8eb38035db am: 1bd3e02a8a
am: 3998910222  -s ours

Change-Id: I70bfe58ce090142cca39f7a7a4392ede22233420
---

1981d50808fa35d66cdecc9dd2b63fe68d9c5ddd