| commit | 12c7d2828d9b7b6646576c56bff31c47237d1132 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Fri Oct 12 04:01:18 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 12 04:01:18 2018 -0700 |
| tree | 0e482090a17d5f33123ee3da19685e54681a3f0f | |
| parent | 33f8cba38fb03a24b49417130a4448312cfdbcbc [diff] | |
| parent | 895ebc7f40f9b628964bc6f74b70efc3dddddb8c [diff] |
Merge "Remove explicit dependency on conscrypt" am: 92ed75c5f7 am: 895ebc7f40 Change-Id: Ifc60c79244a991731e563e020a761c99002bf39e