| commit | d0fb8ca8aa475058e467ef21567a11fb9d74a76f | [log] [tgz] |
|---|---|---|
| author | Nikita Iashchenko <nikitai@google.com> | Thu Nov 05 11:29:10 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 05 11:29:10 2020 +0000 |
| tree | c29072b8e49abd366f295d4833e4dbe1fcda035a | |
| parent | 5ae58eaa35ac5cc7e561b8211c63f81b9ab8e07c [diff] | |
| parent | c2714908630229cfcaf0941c6647c75ee89dc3e4 [diff] |
[automerger skipped] Merge "Import TLS handshake atom for Conscrypt" am: 97f35bbbef am: bce0208847 am: d5cad5b37b am: c271490863 -s ours am skip reason: Change-Id I142a792c34dced6b0e27b867ed3a1d95249a5f7f with SHA-1 98656eef99 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484136 Change-Id: I4cc60ffc7e8fa7bf67154f72c1433edd345d8cc4