tree 40d9bb596b5ae3de67c9e311892e706dd934f9dc
parent 4481c35567d8564b52f0af5aa7c010ff8c3ff4a8
parent 82428a862f325238cfb5646bbd65de3f1a11e7cc
author Gloria Wang <gwang@google.com> 1309969325 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1309969325 -0700

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"