summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-02 01:59:26 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-02 01:59:26 +0000
commit7a17e9343c3c70b7003020d103a91395f26d5ff1 (patch)
tree6795f53bbf55736fbb50314dc904d7ffb2b063fa
parentb8f58cf214a036c9de39a67f6fd4f8a58af01a4b (diff)
parent4e2780b4655ba7b6fd339b61a8ba75f112d4139b (diff)
downloadUniversalMediaPlayer-7a17e9343c3c70b7003020d103a91395f26d5ff1.tar.gz
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6cac9e854d -s ours am: cf81650c4e -s ours am: 3d46b10519 -s ours am: 4e2780b465 -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: Ia7947d9e1adbfb86df5ab7f8a1309e6375129e61
0 files changed, 0 insertions, 0 deletions