| commit | c4f67fb0b87453b96636c102ef6981bb35f5aa38 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Feb 14 18:03:41 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 14 18:03:41 2022 +0000 |
| tree | 0616eaa6e32bacc2a604dee522eef92c40745e5b | |
| parent | cb69213eebdb81a487ab9c72b74d0cd5cd64c419 [diff] | |
| parent | 61274249d41d8a59198510e73a0de4f2842bb4f6 [diff] |
[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 61274249d4 -s ours am skip reason: Merged-In I4d4a3262d277257facbb0ce935df3a3eb711474f with SHA-1 748cbdb0b7 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/16845141 Change-Id: Ic698f3604c570a2bb5428751431a46b9fb2f419f