summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-11 03:33:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-11 03:33:33 +0000
commit181ba568d3b823509aaf47ad3a6d8e62352bcef1 (patch)
tree6795f53bbf55736fbb50314dc904d7ffb2b063fa
parent3d46b105193a3fff4bed7d07d706b5b144a4c904 (diff)
parent583412630f3e1fa22fa3f8d55171abbffd3ac479 (diff)
downloadUniversalMediaPlayer-181ba568d3b823509aaf47ad3a6d8e62352bcef1.tar.gz
[automerger skipped] Merge Android R am: d5cbd53d8e -s ours am: a611cef975 -s ours am: 583412630f -s ours
am skip reason: Change-Id I5667593cf89e4432861a5033ea57281507ddce74 with SHA-1 6cac9e854d is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1422462 Change-Id: If5dbb369e4e6c41fe98931af936c011136480353
0 files changed, 0 insertions, 0 deletions