| commit | 9ab49fe506e0b61208f3aa0d72e3185ef2d4ed1f | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Wed Feb 27 05:02:39 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 27 05:02:39 2019 -0800 |
| tree | b6f8e46216da9f8ec6f512279d5349c07c30efb4 | |
| parent | 2d16430de5ca5d52ef65d6f5064b25b49d77a77d [diff] | |
| parent | ea09b911096dc417fb7098a047f02b32eac07188 [diff] |
Merge "Use public APIs instead of Conscrypt ones" am: 1b9adbfdd1 am: dc310b7ccd am: ea09b91109 Change-Id: I15a9439429c474288d4008d1571a9a5a9314cf14