| commit | bc86741f744aefe64dc994fff2308397eb9f2471 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 17 09:43:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 17 09:43:45 2021 +0000 |
| tree | bc3bde3e3a198805bfa2a2522ed3f89cff52eb1a | |
| parent | 978cb71ee2eb2c776091d704e0e8d705ff085968 [diff] | |
| parent | 4d71a365892ea35a619d9518065921486a4b5bf8 [diff] |
[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 4d71a36589 -s ours am skip reason: Merged-In Ic8aa998eaea5817b05635c43341d6a349c1b767d with SHA-1 db5d1fba04 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/16279619 Change-Id: I05c7695641bb0ddb717dd38ea513bb712b436e43