| commit | ba6c03374baadee242fdf78147ec71f4e5b7a250 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Fri Oct 12 04:09:47 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 12 04:09:47 2018 -0700 |
| tree | 0900881bd6734bc9ab1d577c61105b2912d6ba70 | |
| parent | c7758c460ce66ae130ad7abfa9eb7bae3d495e95 [diff] | |
| parent | 12c7d2828d9b7b6646576c56bff31c47237d1132 [diff] |
Merge "Remove explicit dependency on conscrypt" am: 92ed75c5f7 am: 895ebc7f40 am: 12c7d2828d Change-Id: Id13eb586715fa56a243c15fa80a39472501cc913