| commit | c2714908630229cfcaf0941c6647c75ee89dc3e4 | [log] [tgz] |
|---|---|---|
| author | Nikita Iashchenko <nikitai@google.com> | Thu Nov 05 11:16:07 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 05 11:16:07 2020 +0000 |
| tree | 9cc271ba9b1414064d98e365e116051ff54a7fa3 | |
| parent | a6fdffee47f292ea574308b46a54900581661af9 [diff] | |
| parent | d5cad5b37b60844d6b34ebbe0de77b0fde338b23 [diff] |
Merge "Import TLS handshake atom for Conscrypt" am: 97f35bbbef am: bce0208847 am: d5cad5b37b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484136 Change-Id: I34e7639f6fb4aa3516302d6d63fc74fd632dbcea