tree 17715afb0c28ad991b5002663921cddd2cfc305c
parent caa677c0a8e1b6948bc06ef545f5696cef04d9f1
parent ab7b3f6c2b49645796bccb4dcdf5c8fc831bb26e
author Xin Li <delphij@google.com> 1702332138 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702332138 +0000

[automerger skipped] Merge Android 14 QPR1 am: 91b06aa512 -s ours am: ab7b3f6c2b -s ours

am skip reason: Merged-In I5259eac6081347d19b0658566ce4c1d73ee1974f with SHA-1 9388fc8f5e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/photoviewer/+/2862949

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