tree 09761bbcd5028a9f5f8b7a048b01e9b0ab0a6926
parent b0bcc1f9753a647b473449141605fcf2409df88c
parent efc19c941cd985da81a35e10be28587af2d74f25
author Xin Li <delphij@google.com> 1633679804 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679804 +0000

[automerger skipped] Merge "Merge Android 12" am: 6a61f5e26e -s ours am: 6386748dd0 -s ours am: efc19c941c -s ours

am skip reason: Merged-In Ic0b62464a326d6a7b6afd823414c6c8fd0d67547 with SHA-1 fbecf384e0 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1847444

Change-Id: I06c94c0934220cd04a402b57604b203119bc30d6