Merge "To remove the old DRM support totally because we added the new Forward Lock...
authorGloria Wang <gwang@google.com>
Wed, 22 Jun 2011 20:47:19 +0000 (13:47 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 22 Jun 2011 20:47:19 +0000 (13:47 -0700)
commitbe23a726e81b33d74708b90bab077802eced0f5f
tree1b45087b1431cd9cdf7a9284528bf2cf87b8f598
parent89eb951181e07ac00aa4d2bf7a183c6606cbdea2
parenta1902f4d26a5c87dddf52e2e855bcd6ed9734ab2
Merge "To remove the old DRM support totally because we added the new Forward Lock support in Download Provider."
AndroidManifest.xml
ui/src/com/android/providers/downloads/ui/DownloadAdapter.java