summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-08 01:39:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 01:39:34 +0000
commitaddf12319cd78e208fd786fef6cf96b906a4776b (patch)
tree464a1a92e3f99cc1cabc15d1f028e068868bbc34
parent2bdc5ea1901a7599f9ec1f5c8421487383a0f25e (diff)
parent86a64254f73be8685d1d80fd6938706039a59b48 (diff)
downloadphotoviewer-addf12319cd78e208fd786fef6cf96b906a4776b.tar.gz
[automerger skipped] Merge "Merge Android 12" am: a300ad10db -s ours am: 86a64254f7 -s ours
am skip reason: Merged-In Ide2685e328286606a7f32f8e4dbebc3c7f4b1be8 with SHA-1 7d189134fa is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/1847660 Change-Id: I7d9b946a13f8d4332d7fb9fa42eac33f8eeb34dd
0 files changed, 0 insertions, 0 deletions