tree 46df0282ca1eb123f454774b90fc93d82c632d38
parent d0ed571be0886987ddc7285341a8b9cb22f96899
parent 127b798ff9bd6a76c3a5a8816b59a92586e355d3
author Eino-Ville Talvala <etalvala@google.com> 1399650944 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399650944 +0000

am 127b798f: (-s ours) am 0b42423c: DO NOT MERGE: Add standard android.hardware.camera.external permission file.

* commit '127b798ff9bd6a76c3a5a8816b59a92586e355d3':
  DO NOT MERGE: Add standard android.hardware.camera.external permission file.