| commit | f14decae47dbc2353e70fdcf0f654ad29593ce9d | [log] [tgz] |
|---|---|---|
| author | Mathew Inwood <mathewi@google.com> | Fri Dec 03 10:52:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 03 10:52:55 2021 +0000 |
| tree | c94ad78cedc16a545e7c1c619b3b2724ec83f709 | |
| parent | 92ac9748da6d95f4b3b31d029679e92048cf45d3 [diff] | |
| parent | ae46098f4f23aab695774077b04ab3b7ee55f090 [diff] |
[automerger skipped] Add support for MODULES_BUILD_FROM_SOURCE for consistency with am: 748cbdb0b7 -s ours am: ae46098f4f -s ours am skip reason: Merged-In I4d4a3262d277257facbb0ce935df3a3eb711474f with SHA-1 a23c7c8e7b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/16379882 Change-Id: I0c262364db98678fbe812971f36843f44603e5df