am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1

* commit '20cf0916cc6a4920b1d882a9478615a15fe6b3b0':
  Bug 5585323 New system permission for media decode
This commit is contained in:
Jean-Michel Trivi 2011-11-09 16:59:48 +00:00 committed by Android Git Automerger
commit 72aa4697fa

Diff Content Not Available