Neil Fuller a76674f153 resolve merge conflicts of fe9b32e4be to qt-dev-plus-aosp ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: Merge conflict resolution for approved change
Change-Id: I39bda8417f709f86b5b389a75ff34df8a28a3d8d

2019-04-11 18:09:18 +00:00

..

AssociationRequest.aidl

…

AssociationRequest.java

…

BluetoothDeviceFilter.java

…

BluetoothDeviceFilterUtils.java

Fix NPE in companion device filter matching

2019-03-01 15:34:24 -08:00

BluetoothLEDeviceFilter.aidl

…

BluetoothLeDeviceFilter.java

resolve merge conflicts of fe9b32e4be to qt-dev-plus-aosp

2019-04-11 18:09:18 +00:00

CompanionDeviceManager.java

…

DeviceFilter.java

…

ICompanionDeviceDiscoveryService.aidl

…

ICompanionDeviceDiscoveryServiceCallback.aidl

…

ICompanionDeviceManager.aidl

…

IFindDeviceCallback.aidl

Add @UnsupportedAppUsage annotations

2019-03-22 11:43:11 +00:00

WifiDeviceFilter.java

…