| commit | 53a6fc9f40b077998ac2574bd854580b0610020e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:17 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:17 2020 +0000 |
| tree | 14c52d280ad337a3554e6fa0de4ae6327c59dd11 | |
| parent | 4da5bbd4e83827c597bdb36278987c84d8b636e0 [diff] | |
| parent | 44ab8d50b63edb02629cc5ba3e9bcbdf5533ad1a [diff] |
[automerger skipped] Merge Android R am: 1bd4a99739 -s ours am: 44ab8d50b6 -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: Id677f335ee75478c08e6f76296275ba5e982a454