Glenn Kasten 67ffd5e617 resolve merge conflicts of c76a3ac to stage-aosp-master ...

Change-Id: Ifff16bdc42e8326f3f60cf4b92688c445cb4db25

2016-08-17 13:28:04 -07:00

..

MtpNotificationManager.java

Handle the uncommon case that a name is null

2016-05-31 10:16:30 -07:00

UsbAlsaManager.java

Added logging to USB Audio connect and disconnect.

2016-03-28 13:07:09 -06:00

UsbAudioDevice.java

…

UsbDebuggingManager.java

…

UsbDeviceManager.java

Fix notifications for USB PD enabled devices

2016-05-19 20:46:21 +00:00

UsbHostManager.java

…

UsbMidiDevice.java

Squashed commit of the following:

2016-08-17 08:45:39 -07:00

UsbPortManager.java

…

UsbService.java

…

UsbSettingsManager.java

Skip MTP launch notification for devices having FEATURE_AUTOMOTIVE.

2016-03-09 12:53:50 +09:00