OSDN Git Service

Merge "Bug 5585323 New system permission for media decode" into ics-mr1
authorJean-Michel Trivi <jmtrivi@google.com>
Wed, 9 Nov 2011 16:57:43 +0000 (08:57 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 9 Nov 2011 16:57:43 +0000 (08:57 -0800)
commit20cf0916cc6a4920b1d882a9478615a15fe6b3b0
tree0cc1d5f8b243996d94080ceec6b229f68275e6b3
parentb6b44cef94a38b6f403b43f55d77d3602de18a3c
parent4ba27fe702580a90c6e9c1861d4ea2da6fc3b029
Merge "Bug 5585323 New system permission for media decode" into ics-mr1
core/res/AndroidManifest.xml
core/res/res/values/strings.xml