OSDN Git Service

Merge changes I6d4f8ec3,Id4c1e86c into pi-dev
authortim peng <timhypeng@google.com>
Tue, 22 May 2018 04:44:15 +0000 (04:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 22 May 2018 04:44:15 +0000 (04:44 +0000)
commite3a87548e5bc488a76f0d197f059fe1edb8bbb57
tree6efed8bf10f9cd555ce31fe16cc99e4887c0492b
parent7ecbfd23f2b81a6ecb89bb2989a51ff129e38fed
parent78eb5a81ba4b1236b6764a540546de3a84ca0c3f
Merge changes I6d4f8ec3,Id4c1e86c into pi-dev

* changes:
  Make device discoverable in Connected Devices settings page
  Add bluetooth discoverable footer preference in connected devices page
src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java