| commit | 5895e970ae119210773a5184c019178e2516b132 | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Wed Jul 06 09:22:05 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 06 09:22:05 2011 -0700 |
| tree | c5e38d96737f30c0f5bf3a086192a9fe0b92bc5f | |
| parent | d26edf9435bf5bdb43b5a1f71192bb1477a1cc7f [diff] | |
| parent | 0d0edfb024f65f7e1097bf1814ae229ce9cb367d [diff] |
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"