tree 360e7ff53084145be4674fef604c83238cd3ea5b
parent 69c11354055b1dba3641f328903a20582decdf7b
parent 393ad6e0ad1670a1d33e97f7bb07b0df381b5e76
author Jayant Chowdhary <jchowdhary@google.com> 1566417196 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1566417196 +0000

Merge "Add SYSTEM_CAMERA capability to camera2 and define @SystemApi SYSTEM_CAMERA permissions."