tree c4042ba7bf201f8d4ac726e876f30cc168f0d032
parent b4ac0ea6c45c04ac3e69d6b2243cfec58e858495
parent ceb388d6c03c38b96dc41c0ea4804b749aa077c4
author Eino-Ville Talvala <etalvala@google.com> 1361842839 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1361842839 +0000

am ceb388d6: CameraService and Stagefright: Support AppOps

* commit 'ceb388d6c03c38b96dc41c0ea4804b749aa077c4':
  CameraService and Stagefright: Support AppOps