diff options
author | Xin Li <delphij@google.com> | 2023-10-06 09:55:03 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-06 09:55:03 +0000 |
commit | c36c95f2d1800bd3b88870dd72f6d31b6c881a83 (patch) | |
tree | d9fcf894623a722156bf9425ec22399dea661f53 | |
parent | f215f5d651057cb173f982c88f805d16827292eb (diff) | |
parent | d40aa75f3a04ade1c8ea7bc252dc8e68f4b9770e (diff) | |
download | Camera2-c36c95f2d1800bd3b88870dd72f6d31b6c881a83.tar.gz |
[automerger skipped] Merge "Merge Android 14" into main am: 17eabae5f3 -s ours am: b0d50bda8a -s ours am: d40aa75f3a -s ours
am skip reason: Merged-In I7263ccf3eadc6521a30c12fe90034e5e05b8dbad with SHA-1 2478ed721d is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2776764
Change-Id: I6cd503b0dcc7824c2f9e253d8359c285ecdeaa7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions