Skip to content
Commit c2714908 authored by Nikita Iashchenko's avatar Nikita Iashchenko Committed by Automerger Merge Worker
Browse files

Merge "Import TLS handshake atom for Conscrypt" am: 97f35bbb am: bce02088 am: d5cad5b3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484136

Change-Id: I34e7639f6fb4aa3516302d6d63fc74fd632dbcea
parents a6fdffee d5cad5b3
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment