| commit | e98ab1d0f7c197b900991c31f52f00d4a49df84c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Dec 21 07:36:38 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 21 07:36:38 2021 +0000 |
| tree | 70146e8b63875b55fe095d871bb646b9574e25d2 | |
| parent | ce3e816b9070b5c35f7ec74f3e976ac68e81ddd4 [diff] | |
| parent | 1f9a77948f38fa5f02401d159959062af6af7a83 [diff] |
[automerger skipped] Merge SP1A.211205.008 am: 89b183e788 am: 3cc896befa -s ours am: 1f9a77948f -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: I06c8da5eb5f70e15ca9d8060c23031eab0b54669