tree 0d3f9ca10de7df2231fdc244925aedba8fd2b236
parent 56f7afb05685f293551dd33d1b52e42114857bc2
parent eaebe4c1062e3196f6dbff1c33ef7ec3c21c1900
author Igor Murashkin <iam@google.com> 1366934269 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366934269 -0700

am eaebe4c1: Merge "Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED" into jb-mr2-dev

* commit 'eaebe4c1062e3196f6dbff1c33ef7ec3c21c1900':
  Add new android.permission.CAMERA_DISABLE_TRANSMIT_LED