commit | 9a92874427d6c74cc53d8c303cb29c90349d2ec3 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Mar 09 10:02:19 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 09 10:02:19 2022 +0000 |
tree | baefc686614e3d988424eaf966f2449402d2a089 | |
parent | 162f63127901feb75b8cd28626aab7ce13e681d8 [diff] | |
parent | c3c6910cc1c5374ce96b42b3aa8661fe24a5b9e5 [diff] |
[automerger skipped] Merge Android 12L am: ed65c36b61 -s ours am: 5061db1025 -s ours am: c3c6910cc1 -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: I4691edfad74e844dfda3af8f37d57632db801bbc