diff options
author | Xin Li <delphij@google.com> | 2022-03-08 11:03:50 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-08 11:03:50 +0000 |
commit | 093c80433b976e4d5f71a7d229bcaa7d2385e74a (patch) | |
tree | 464a1a92e3f99cc1cabc15d1f028e068868bbc34 | |
parent | c95f8bf5f96ae141445d53266836cc16eb579688 (diff) | |
parent | ccbb6909050416232c302634525f7c77f26df40f (diff) | |
download | photoviewer-093c80433b976e4d5f71a7d229bcaa7d2385e74a.tar.gz |
[automerger skipped] Merge Android 12L am: c57b6bc28f -s ours am: ccbb690905 -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: I9e351e821e6ac4d611e1a44b5e52a0cecacdc975
0 files changed, 0 insertions, 0 deletions