commit | ea09b911096dc417fb7098a047f02b32eac07188 | [log] [tgz] |
---|---|---|
author | Adam Vartanian <flooey@google.com> | Wed Feb 27 04:51:05 2019 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Wed Feb 27 04:51:05 2019 -0800 |
tree | 6be184b68afd8ce24dcd78ccb5d3b3390a014fc7 | |
parent | 64f39de1de740f648c584167b2e6390f0d642586 [diff] | |
parent | dc310b7ccdd1a64bd17a8d839c8dc24d5153f3a8 [diff] |
Merge "Use public APIs instead of Conscrypt ones" am: 1b9adbfdd1 am: dc310b7ccd Change-Id: I47b34ef42370d33d9c7b361c30a6044bb3400941