| commit | 5c1026b4dac648f869a43e2e0f6e7828f53781d8 | [log] [tgz] |
|---|---|---|
| author | Jayant Chowdhary <jchowdhary@google.com> | Tue Apr 06 23:07:47 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 06 23:07:47 2021 +0000 |
| tree | 73ceee1e2c4e78cda906f77f5a6e2517755d2022 | |
| parent | effa2b511fdff55842f00db3f26398f6cc2fbb79 [diff] | |
| parent | 9dd252709776a1f6e425a8c64bb78a8f3016640e [diff] |
[automerger skipped] Merge "cameraserver: Enforce system camera rules for setTorchMode and torch callbacks." am: 5b68d9c182 am: 9dd2527097 -s ours am skip reason: skip tag Change-Id Ic849aa91e4d953f45ed99efae997e45671d116b3 with SHA-1 aa6e3ea942 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1658768 Change-Id: Icde6fb781d64939de59ad68b597a1e925bec6803