tree d6425b0f78acf46ed470daad38e98d3593c3f772
parent 5781e83f3c09cee4dfcb758dbebc49af45b3bb1c
parent 10796dfd5981c372fc83e9e6c5b576ab07cf4060
author Xin Li <delphij@google.com> 1656547326 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1656547326 +0000

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: caa160ef24 -s ours am: 76f67405a7 -s ours am: 10796dfd59 -s ours

am skip reason: Merged-In I72b183fc7c8da980d2056bdf84d9425025e6adc5 with SHA-1 f7cbd7ae44 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/19094740

Change-Id: I244fc6c496ced19040fe254d245af8c4297222a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>