tree 1fb50112beadcba35b1f1d8ec658810fabee54f0
parent e9a76ddbd81ba14f148457fb11256f35181b9674
parent fa92674748b169ec7669b20adea1fbc2f11133e2
author Xin Li <delphij@google.com> 1696582754 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696582754 +0000

[automerger skipped] Merge Android 14 am: 7c473e90ba -s ours am: fa92674748 -s ours

am skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history

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

Change-Id: I3c0339d0eed205f86c8b1878cdd05d18bb6391cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>