tree 6795f53bbf55736fbb50314dc904d7ffb2b063fa
parent 0c38e46c28420a30925b3512fe966853d32db173
parent cf81650c4e19c5c5a9664ac3207f3760e17f6cfb
author Xin Li <delphij@google.com> 1598996805 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598996805 +0000

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

am skip reason: Change-Id I5a6abeeeab91e9f2ce7e6f49e863d76f21bd44d6 with SHA-1 56462add52 is in history

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

Change-Id: Ibf9be1de49d155ae7a1ee14d34fa66752806a025