| commit | 08cbdc79383a1dc5fef44f047c66163c9d065e65 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 21:27:33 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 21:27:33 2020 +0000 |
| tree | 6795f53bbf55736fbb50314dc904d7ffb2b063fa | |
| parent | 7a17e9343c3c70b7003020d103a91395f26d5ff1 [diff] | |
| parent | bc5ece38683b1504715f1e960a262ee05598bcd1 [diff] |
[automerger skipped] Merge Android R am: d5cbd53d8e -s ours am: a611cef975 -s ours am: 583412630f -s ours am: 181ba568d3 -s ours am: bc5ece3868 -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: I6e6ab6f915f3824745f41553efb6ba97ccc30d16