summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-08 08:29:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 08:29:20 +0000
commit29a572805ebeca27719725c02a21362a652b7695 (patch)
tree2931fedfdc6caf679715521c2bbfae56c7e2ccfc
parent323552d0ac061714cf12140a359023d087ae3094 (diff)
parent665260523d8f0612fd8820d561d48040f8c364e6 (diff)
downloadCamera2-29a572805ebeca27719725c02a21362a652b7695.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 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: Ie139ead9d8cd9c06d8c0603df4a73e685c45c275
0 files changed, 0 insertions, 0 deletions