OSDN Git Service

Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev...
authorAntony Sargent <asargent@google.com>
Thu, 10 Aug 2017 07:28:51 +0000 (07:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 10 Aug 2017 07:28:51 +0000 (07:28 +0000)
commitd9456d807b02a4453d4b4eb4d6651e3fc3fda8df
tree8ba978b1bc71c6e812f2742355e0ce7c3b9bbb7d
parentfda92d34910c90777aa9115283435ddbd39dd8eb
parent0fe460a8e375b42d74650004569351bc099ca575
Merge "Stay discoverable in Bluetooth settings and pairing pages" into oc-dr1-dev am: 49cd8f2327
am: 0fe460a8e3

Change-Id: I000eba2d8266b3d86f08c336f4ae3217ae48b8ac
src/com/android/settings/bluetooth/BluetoothPairingDetail.java
src/com/android/settings/bluetooth/BluetoothSettings.java