diff options
author | Xin Li <delphij@google.com> | 2021-10-08 07:56:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-08 07:56:43 +0000 |
commit | c7d339e1b16a947e7b5046a789fbdb08dff2ea66 (patch) | |
tree | 0a0b0efda6833924cb9bff895730c5da04482c0a | |
parent | 5b60077720165cf5d86123ef6510dc6132278af6 (diff) | |
parent | 493b1834ae8bdb0a6d2cd57397d3e7c97437099f (diff) | |
download | UniversalMediaPlayer-c7d339e1b16a947e7b5046a789fbdb08dff2ea66.tar.gz |
[automerger skipped] Merge Android 12 am: e50d84f657 -s ours am: abee3c07bf -s ours am: 493b1834ae -s oursandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
am skip reason: Merged-In I73d64334d80989a28d24d4528122c754d6b653e9 with SHA-1 a048cbce4b is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1847671
Change-Id: Iba60e1cbb0ff72eafb38b96ad7d219f959ae4717
0 files changed, 0 insertions, 0 deletions