| commit | f0459dc8070a7fac9923ac25c8ef1c967f0d57cb | [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 | 4516f5a0e380d2ed4ab016fc27c6a157979ce163 | |
| parent | 0dedc8b8dcd7d176e22900bee3c34e29bfc00a39 [diff] | |
| parent | ea030363d3498ff3434a53da89db5b869a9197bd [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"