diff options
| author | Xin Li <delphij@google.com> | 2020-09-11 03:58:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 03:58:39 +0000 |
| commit | 15330afc60c4550e51ad446622589d8db4d68c4b (patch) | |
| tree | 14c52d280ad337a3554e6fa0de4ae6327c59dd11 | |
| parent | a4a4547daf79a69ba9a97a84fefbd14ca6441add (diff) | |
| parent | 92efbdae0923f8037a11e11446f5c5c61a4ad7e6 (diff) | |
| download | LocalMediaPlayer-15330afc60c4550e51ad446622589d8db4d68c4b.tar.gz | |
[automerger skipped] Merge Android R am: 1bd4a99739 -s ours am: 44ab8d50b6 -s ours am: 53a6fc9f40 -s ours am: 92efbdae09 -s ours
am skip reason: Change-Id I798a1915e669f8ef63b1cd29d4aa408f9ae5bac3 with SHA-1 0441a5bd32 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/LocalMediaPlayer/+/1422444
Change-Id: I49eda34cb1fde03eaffe1b70fbefc2820ddcb0b2
0 files changed, 0 insertions, 0 deletions