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

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: fbecf384e0 -s ours am: 4e5adba12b -s ours am: b0bcc1f975 -s ours

am skip reason: Merged-In If3d36c15e515f85cd778a82be849fe01294b0ef1 with SHA-1 68c4302a23 is already in history

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

Change-Id: I77f7564071fd754ab56715b91a5f89787056cacb