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

* commit '036da41922c936d25b36fbc4b5927a0097ece330':
  Bug 5585323 New system permission for media decode
tree: b53f5f842d7a0932395991668df908d9a4f5d2b8
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE