tree 18235eb95d23cf4c598151f31e77f59cfa1660f0
parent 0ca8fd09acf3a67af098b30b36706e7d9b490a5a
parent 202175bd9cb1022d8640dd80b5f3927c14183534
author David Jia <davidjia@google.com> 1721421329 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1721421329 +0000

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

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

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