tree 14c52d280ad337a3554e6fa0de4ae6327c59dd11
parent a7694ff632827c8808dd41425b617b916f3d4603
parent 4da5bbd4e83827c597bdb36278987c84d8b636e0
author Xin Li <delphij@google.com> 1598996781 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598996781 +0000

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

am skip reason: Change-Id I252b60e23db8e01fd2646b472834f415ac5da336 with SHA-1 4cb5af9389 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/LocalMediaPlayer/+/12470282

Change-Id: Ib391a5e4cdef539f473df035585e940d7363f0e2