Sungsoo 4d3a4132c2 resolve merge conflicts of 3fc6b8f to master ...

Change-Id: I004b34699fd997805d6c37753c48fe1f1d226095

2016-10-14 08:17:19 +09:00

..

media

resolve merge conflicts of 3fc6b8f to master

2016-10-14 08:17:19 +09:00

mtp

Do not access MTP devices when disabled.

2016-09-30 22:24:23 +00:00

service/media

MediaBrowser: Make ItemCallback can take a null media item

2016-08-30 14:23:38 +09:00