tree 1fb50112beadcba35b1f1d8ec658810fabee54f0
parent 0af31d129078025b8e5d47f76ee44bfc983a687b
parent 39c3832fca285891ca4a9da71aa870716798d823
author Xin Li <delphij@google.com> 1696585849 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696585849 +0000

[automerger skipped] Merge Android 14 am: 7c473e90ba -s ours am: fa92674748 -s ours am: 39c3832fca -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: I9a6d29ceb1f36b80bab4a5c3efda72cf44093938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>