tree b6f1189a3fc984d264f6f78a76d14e4480ff67b0
parent f31c0342a77f8f371df4d2b6cd98426247a35174
parent 6a6e2b8487eac9d4d5fab13906e5689496741d7a
author Xin Li <delphij@google.com> 1656547318 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1656547318 +0000

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 0db7f479f7 -s ours am: e71167a780 -s ours am: 6a6e2b8487 -s ours

am skip reason: Merged-In I552bd8c40996f8aead756163f9e244fe6a7c3223 with SHA-1 f31c0342a7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery/+/19094808

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