tree da0c2851599838344810814a7073194f5fe07f31
parent f29379c9a11744444e300032f442a86d635c5b7a
parent 98adb587e14440141d2aa0d9d1dda1d52fbe34c0
author Xin Li <delphij@google.com> 1599796725 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796725 +0000

[automerger skipped] Merge "Merge Android R" am: 8808cb9b0a -s ours am: 3f1edd1986 -s ours am: ac692c878b -s ours am: 98adb587e1 -s ours

am skip reason: Change-Id I0458473bf83a3196a87e6764c345c667f3d5f663 with SHA-1 5a77711ecc is in history

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

Change-Id: I1af85c2c97a48bcfc1fc105c6d23d217f7497e00