Mike Lockwood e6f3f54e05 resolved conflicts for merge of b107f4de to master ...

Change-Id: I0290c8517562bcbba7ac1f6ed358011c8e7e250e

2011-05-16 16:08:12 -04:00

..

MtpConstants.java

USB: minor cleanup work

2011-03-11 18:51:29 -05:00

MtpDatabase.java

DO NOT MERGE MTP and media provider support for multiple storage devices:

2011-05-04 10:41:20 -04:00

MtpDevice.java

docs: add package description for mtp and a little more info to MtpDevice

2011-05-05 15:53:44 -07:00

MtpDeviceInfo.java

Add MTP/PTP host support to the public API

2011-02-11 09:09:11 -05:00

MtpObjectInfo.java

Add MTP/PTP host support to the public API

2011-02-11 09:09:11 -05:00

MtpPropertyGroup.java

DO NOT MERGE MTP and media provider support for multiple storage devices:

2011-05-04 10:41:20 -04:00

MtpPropertyList.java

Move MTP Java classes to android.mtp.* package.

2010-12-30 11:54:33 -05:00

MtpServer.java

DO NOT MERGE MTP and media provider support for multiple storage devices:

2011-05-04 10:41:20 -04:00

MtpStorage.java

MTP: Have GetStorageInfo command return correct storage type for removable storage

2011-05-16 14:29:45 -04:00

MtpStorageInfo.java

Improve Javadoc for USB Manager and MTP/PTP support.

2011-04-01 14:11:50 -04:00

package.html

docs: add package description for mtp and a little more info to MtpDevice

2011-05-05 15:53:44 -07:00