[automerger skipped] Merge "Import TLS handshake atom for Conscrypt" am: 97f35bbbef am: bce0208847 am: d5cad5b37b am: c271490863 -s ours am: d0fb8ca8aa -s ours

Browse Source

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: I1a4f6ead9e46ee1480266b029c0e851b13c0c9d8

...

This commit is contained in:

Nikita Iashchenko

2020-11-05 11:38:52 +00:00

committed by Automerger Merge Worker

parent 901aefcf3b d0fb8ca8aa

commit 3ee857335f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available