Alex Klyubin f271c6d266 resolve merge conflicts of b53d984 to master ...

Change-Id: I3fe63a5c0193c720b8ec4ca53834096de8433f26

2016-12-22 12:00:24 -08:00

..

MtpConstants.java

Remove MTP API marked as @removed.

2016-05-26 16:39:21 +09:00

MtpDatabase.java

…

MtpDevice.java

Properly close USB device connection in Mtp device

2016-10-17 11:19:58 -07:00

MtpDeviceInfo.java

Add @NonNull / @Nullable annotations to android.mtp API.

2016-07-08 11:28:00 +09:00

MtpEvent.java

…

MtpObjectInfo.java

Add @NonNull / @Nullable annotations to android.mtp API.

2016-07-08 11:28:00 +09:00

MtpPropertyGroup.java

…

MtpPropertyList.java

…

MtpServer.java

resolve merge conflicts of b53d984 to master

2016-12-22 12:00:24 -08:00

MtpStorage.java

…

MtpStorageInfo.java

Add @NonNull / @Nullable annotations to android.mtp API.

2016-07-08 11:28:00 +09:00

package.html

…