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

am: f7b4fd24e3

Change-Id: Ib06db403955ae0056c1fee0e09f9249d0b887ea1

2016-08-17 21:10:59 +00: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

Add (corrected) usb power sink handling

2016-07-29 08:39:10 -07: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