| commit | 86a64254f73be8685d1d80fd6938706039a59b48 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 01:20:09 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:20:09 2021 +0000 |
| tree | 464a1a92e3f99cc1cabc15d1f028e068868bbc34 | |
| parent | 7d189134fa7f9480951baa3f2ba066e4ea77eef4 [diff] | |
| parent | a300ad10dbd4c970cbb9e4bf15b623f7aac49f60 [diff] |
[automerger skipped] Merge "Merge Android 12" am: a300ad10db -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: I790f7446c5532202b5614bc2a6cb2eb92186382b