summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-08 01:39:07 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 01:39:07 +0000
commit9fe0c4e6d40e2b7e2817e2e063d3cfb4ca6d6b69 (patch)
tree2931fedfdc6caf679715521c2bbfae56c7e2ccfc
parent7259f978861438c8a950b56ca0cc189a9d53f7fd (diff)
parent002b97e836fb11f4701010d1c279bcf9d35ac093 (diff)
downloadCamera2-9fe0c4e6d40e2b7e2817e2e063d3cfb4ca6d6b69.tar.gz
[automerger skipped] Merge "Merge Android 12" am: 5b93afd7fc -s ours am: 002b97e836 -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: I302080aade90e9523744863861a1c97b35d10adf
0 files changed, 0 insertions, 0 deletions