commit | c3c6910cc1c5374ce96b42b3aa8661fe24a5b9e5 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Mar 08 11:03:48 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 08 11:03:48 2022 +0000 |
tree | 978e933749d445037258ca30904f420d66eed65e | |
parent | 991dc1c9ed6e15ef4023684db46d49db63531c8d [diff] | |
parent | 5061db102536e753261fb6907615eb62f4153cf2 [diff] |
[automerger skipped] Merge Android 12L am: ed65c36b61 -s ours am: 5061db1025 -s ours am skip reason: Merged-In If11cffc2b37f0868ff178d95a9f946700cb59ba0 with SHA-1 610787d703 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/Media/+/2013427 Change-Id: Ib5c9442e09eda68f6ebcdb48ed0c1dd6fc212419