| commit | 2c3eace0d57aaf5f1552f756b273f9374ea5edc5 | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Fri Oct 08 08:29:41 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Fri Oct 08 08:29:41 2021 +0000 |
| tree | 0a0b0efda6833924cb9bff895730c5da04482c0a | |
| parent | 104752ad3e835c1de1492908806bbfe9a69f9e80 [diff] | |
| parent | c7d339e1b16a947e7b5046a789fbdb08dff2ea66 [diff] |
[automerger skipped] Merge Android 12 am: e50d84f657 -s ours am: abee3c07bf -s ours am: 493b1834ae -s ours am: c7d339e1b1 -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: Ia36469eb649c1f40398c5ab00a3e11d45ad14416