commit | addf12319cd78e208fd786fef6cf96b906a4776b | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 01:39:34 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:39:34 2021 +0000 |
tree | 464a1a92e3f99cc1cabc15d1f028e068868bbc34 | |
parent | 2bdc5ea1901a7599f9ec1f5c8421487383a0f25e [diff] | |
parent | 86a64254f73be8685d1d80fd6938706039a59b48 [diff] |
[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