| commit | d5cad5b37b60844d6b34ebbe0de77b0fde338b23 | [log] [tgz] |
|---|---|---|
| author | Nikita Iashchenko <nikitai@google.com> | Thu Nov 05 10:56:55 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 05 10:56:55 2020 +0000 |
| tree | ddac6af7ea3018d7f965614d3883f7c4401049df | |
| parent | 942afe4c9fb9ad196089afa42b4ede461593f4ae [diff] | |
| parent | bce0208847388a2b2e9243658ca348c74aeb850a [diff] |
Merge "Import TLS handshake atom for Conscrypt" am: 97f35bbbef am: bce0208847 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484136 Change-Id: I6afaab8235979ddded27bee84c90fb4277ef19fa