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