diff options
author | Xin Li <delphij@google.com> | 2021-10-08 08:59:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-08 08:59:31 +0000 |
commit | 49509f84ae0e77373eca4bf84c343b3871376e0b (patch) | |
tree | 607249306e39518254e6c17fcd7fdb0b68a13920 | |
parent | 22a2d8f7dcca00e00649437e7e663e3f323e3f51 (diff) | |
parent | 29a572805ebeca27719725c02a21362a652b7695 (diff) | |
download | Camera2-49509f84ae0e77373eca4bf84c343b3871376e0b.tar.gz |
[automerger skipped] Merge "Merge Android 12" am: 5b93afd7fc -s ours am: 002b97e836 -s ours am: 9fe0c4e6d4 -s ours am: 665260523d -s ours am: 29a572805e -s ours
am skip reason: Merged-In I950f219dbcb4e125e2eb29d5311241601a673f79 with SHA-1 efe4290d06 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1847695
Change-Id: I73bad4c5f09a14af06536bd2efcf14c793e77d5c
0 files changed, 0 insertions, 0 deletions