Lei Yu e81224d80c resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp ...

Bug: 115707279
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifd8f2c090ccd9eadbc7b789b927550bce732f1d1
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389

2018-10-25 14:25:21 -07:00

..

dock

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

usb

resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp

2018-10-25 14:25:21 -07:00

AddDevicePreferenceController.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

AdvancedConnectedDeviceController.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

AdvancedConnectedDeviceDashboardFragment.java

Merge "Fix bluetooth search result no-op" into pi-dev

2018-05-29 19:40:14 +00:00

AvailableMediaDeviceGroupController.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

BluetoothDashboardFragment.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

BluetoothOnWhileDrivingPreferenceController.java

Establish permanently unavailable settings

2018-05-09 10:03:40 -07:00

ConnectedDeviceDashboardFragment.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

ConnectedDeviceGroupController.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

DevicePreferenceCallback.java

Migrate Settings to androidx.

2018-08-28 16:35:52 -07:00

DiscoverableFooterPreferenceController.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

PreviouslyConnectedDeviceDashboardFragment.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

PreviouslyConnectedDevicePreferenceController.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00

SavedDeviceGroupController.java

DO NOT MERGE Import clean up.

2018-09-04 13:54:46 -07:00