tree 0a0b0efda6833924cb9bff895730c5da04482c0a
parent a048cbce4bc3b024d0cecb37a300714cab969005
parent e50d84f657a48f6f6ada1f49aba53f0781a07abf
author Xin Li <delphij@google.com> 1633656002 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633656002 +0000

[automerger skipped] Merge Android 12 am: e50d84f657 -s ours

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: If416e389ded2483b6cd379cb988d2f841b0b92df