commit | a56170cac624f5cd5b5344de8a24b074049d9076 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 08:59:52 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:59:52 2021 +0000 |
tree | 0a0b0efda6833924cb9bff895730c5da04482c0a | |
parent | 076552596d997377d5893a1bf8f303a229b06846 [diff] | |
parent | 2c3eace0d57aaf5f1552f756b273f9374ea5edc5 [diff] |
[automerger skipped] Merge Android 12 am: e50d84f657 -s ours am: abee3c07bf -s ours am: 493b1834ae -s ours am: c7d339e1b1 -s ours am: 2c3eace0d5 -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: I5ed4321368d2173496fce4ad68e463343b0f3769