diff options
author | Jayant Chowdhary <jchowdhary@google.com> | 2019-09-24 20:05:18 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-24 20:05:18 +0000 |
commit | 7f9a4c9e8cc8d32a6128c9c55d576793a2f0ecf8 (patch) | |
tree | 696e8acc02ec213e117758d168d44668051cac81 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | c022a8d13a811419e9efdd9d9c5748bbace9e9f2 (diff) | |
parent | 4feeee88911503cc365b223a712437abcd91c94f (diff) |
Merge changes from topic "system-camera-cts"
* changes:
Allow com.android.shell to get RECORD_AUDIO permissions.
CameraManager: Add @TestApi method getCameraIdListNoLazy().
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions