| commit | 52cc9e18b5ab37ca29e1bfb4d5c22685d325b854 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Dec 21 07:50:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 21 07:50:12 2021 +0000 |
| tree | fa84a7918a87943fba47befec1320aea519af606 | |
| parent | 144ecee7aea6b0ca15b64063297b682a328e1043 [diff] | |
| parent | e98ab1d0f7c197b900991c31f52f00d4a49df84c [diff] |
[automerger skipped] Merge SP1A.211205.008 am: 89b183e788 am: 3cc896befa -s ours am: 1f9a77948f -s ours am: e98ab1d0f7 -s ours am skip reason: Merged-In I9b82e9b60093b9bdd87a538de3c5da3d87795ae8 with SHA-1 f121b7a86b is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/1929523 Change-Id: Id51e260d382671b9eb74041e3d93a45716d22257