tree 28901a4b6ff7ca432ac72dacbdffcf43697cc0eb
parent 744329796f9bf05d80794fc676eb0be4d7df7273
parent a4e0d3bea1576c1a957016f48a352ad6c5c0d08c
author Adam Vartanian <flooey@google.com> 1551271522 -0800
committer android-build-merger <android-build-merger@google.com> 1551271522 -0800

Merge "Use public APIs instead of Conscrypt ones" am: efe309e03d
am: a4e0d3bea1

Change-Id: I58650fb6ff72b6cc8129890dcc7a831d66a567fe