tree 9415d2d6611767040d0ff32ee5a3261ff38b12ef
parent 121dab8e6b0f940ec8496bda80970a1561db232a
parent 1b9adbfdd1f18cb16e82f9a6f158d3ac242fffa1
author Adam Vartanian <flooey@google.com> 1551270886 -0800
committer android-build-merger <android-build-merger@google.com> 1551270886 -0800

Merge "Use public APIs instead of Conscrypt ones"
am: 1b9adbfdd1

Change-Id: I8747b75ef6eccaabffa0455f2a6e53a9865dbd7d