OSDN Git Service

Merge "Bluetooth: Make notifications local-only" am: 348a7085fa
authorMarie Janssen <jamuraa@google.com>
Thu, 22 Jun 2017 15:41:55 +0000 (15:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 15:41:55 +0000 (15:41 +0000)
commit3cc4522cbc525df9081985ad16c373a16e92f2e2
treead0fad45c97be7b207bb0db3bf626c0b60fed2fa
parenta3821d019ab962f886af43da6d0f2b2ee895ffb6
parent620fe71520994aa7a560fc6107241628fffb62db
Merge "Bluetooth: Make notifications local-only" am: 348a7085fa
am: 620fe71520

Change-Id: I3df0a009c7fc6184ea1176f6953748c5031d76cd
src/com/android/settings/bluetooth/BluetoothPairingService.java
src/com/android/settings/bluetooth/BluetoothPermissionRequest.java