| commit | 3cc896beface141c34b70010d3ea3361667fa8ce | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Dec 21 05:21:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 21 05:21:39 2021 +0000 |
| tree | 3b8cea5b1ec76ee140ba0c71e9889dfcd0812df1 | |
| parent | 30ca68928ccd1407df520e3ca47a6544586dc535 [diff] | |
| parent | 89b183e788e387c2dd7c080f0f81db21012e539f [diff] |
Merge SP1A.211205.008 am: 89b183e788 Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/conscrypt/+/1929523 Change-Id: I8d375d1c7505e57a1456daf5272fbb616d1e39fe