summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2022-03-08 10:21:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-08 10:21:48 +0000
commitb25c80bffd1fec950c4ebcdfc9ecb63c1ce9ad28 (patch)
tree464a1a92e3f99cc1cabc15d1f028e068868bbc34
parentccbb6909050416232c302634525f7c77f26df40f (diff)
parentef9ae5ced4cc80671cbbb489a000b4e0a4c9235a (diff)
downloadphotoviewer-b25c80bffd1fec950c4ebcdfc9ecb63c1ce9ad28.tar.gz
[automerger skipped] Merge "Merge Android 12L" am: ef9ae5ced4 -s ours
am skip reason: Merged-In I9ac945126d0372db32986502b8874f1462c663ee with SHA-1 6b3ececa9e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2012828 Change-Id: Ic26c604581fbb00e0ce813c174c1dde8a5ae72db
0 files changed, 0 insertions, 0 deletions