commit | 30a4e6c7f92eafe45924d298896ecf6a94c57628 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Nov 09 23:15:40 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 09 23:15:40 2021 +0000 |
tree | d8627c4eda473d5658f8c0049d53c7c7e54a97fd | |
parent | dd87103c812e256e59075969a4364a09b83978a4 [diff] | |
parent | 2c0c472a2f41c78dc12679414f8a30caf832ead6 [diff] |
[automerger skipped] Merge "cameraserver: fix deadlock scenario in torchModeStatusChanged callback." am: 2658976c6d am: 49c350e533 am: daeafed023 am: 0a0277782e am: 2c0c472a2f -s ours am skip reason: Merged-In Id95a2aa061b6cb4db4a25b1a2aa6a390f898af87 with SHA-1 46ef0f509f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1865119 Change-Id: I940233a3e2ff4095e2f858e762b86c5bad1f9707