tree 066b4055e8dab1ebdde32703b755745f133cfb72
parent 79b675a9fc179e68b76b80c356fa1db65e850cf7
parent 54081419923772e4950017604153d4f27c513552
author Xin Li <delphij@google.com> 1598992629 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598992629 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 5408141992 -s ours

am skip reason: Change-Id Ia849c0db28e6aafb8f7cd8d69987fc9854cff2fe with SHA-1 84c924f162 is in history

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

Change-Id: I44bfe9c954eacffd92958d6ee6d7b0d1f53567ea