tree 38b7345ded3cd11be36abe528915eeed8fb7c3df
parent d3df235c66d7a5be0be0d443d7701e7d07e737ef
parent 037e3390b00a7bc1fd618d0668b3347deddf2c09
author Xin Li <delphij@google.com> 1599859653 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599859653 +0000

[automerger skipped] Merge "Merge Android R" am: 98339142d2 -s ours am: 1146c05658 -s ours am: 7b46ec81d3 -s ours am: da777193bd -s ours am: 037e3390b0 -s ours

am skip reason: Change-Id Iab6aa5e2dafdf1ff9629b35e4e2d77d4480b2c5b with SHA-1 5408141992 is in history

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

Change-Id: Ia0474bd805114e599aee6461e2eb8125bf5ee200