Gloria Wang 2da9eb7175 Merge "- Retrieve is_drm in MediaMetadataRetriever. - Add one more column in MediaStore to indicate whether a media file is drm-protected. - Remove old DRM code from Ringtone - Use the new DRM code in RingtoneManager"

2011-07-06 09:22:05 -07:00

..

drm/mobile1

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

media

Merge "- Retrieve is_drm in MediaMetadataRetriever. - Add one more column in MediaStore to indicate whether a media file is drm-protected. - Remove old DRM code from Ringtone - Use the new DRM code in RingtoneManager"

2011-07-06 09:22:05 -07:00

mtp

MTP: Add support for PTP variant of GetDeviceInfo result.

2011-06-21 08:27:06 -04:00