diff options
| author | Jayant Chowdhary <jchowdhary@google.com> | 2021-04-06 23:33:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-06 23:33:01 +0000 |
| commit | 5cbc896e4f3fad8b0e28d2ab2663f24ab81bfada (patch) | |
| tree | 4c3576d6f106fe7fbff32bf89ed14f9ba5b636c6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4a50c4e8470fa7677731c1ddb4839f4009ee3d44 (diff) | |
| parent | d5e80336f6b450e62ede869567fa344c9ef11301 (diff) | |
[automerger skipped] Merge "getCameraIdListNoLazy : remove system cameras from mTorchStatus as well." am: b2f70b04d4 am: 3c83e580b0 -s ours am: d5e80336f6 -s ours
am skip reason: skip tag Change-Id I0a149ba3d93a740cfbfdc2d04c1235e648061156 with SHA-1 02622abbe2 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659167
Change-Id: I8c58965c54f44e4b4fdc3fdf1de47866009ee720
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions