tree 18235eb95d23cf4c598151f31e77f59cfa1660f0
parent f3e10022f8f8399edf01c359d7426b0c99331b35
parent cd16728b2331b56d2f1696bb24b723361863cc49
author David Jia <davidjia@google.com> 1721420164 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1721420164 +0000

Merge remote-tracking branch 'aosp/upstream-main' into main am: cd16728b23

Original change: https://android-review.googlesource.com/c/platform/external/jetpack-camera-app/+/3177250

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