| commit | 895ebc7f40f9b628964bc6f74b70efc3dddddb8c | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Fri Oct 12 03:53:06 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 12 03:53:06 2018 -0700 |
| tree | 0e482090a17d5f33123ee3da19685e54681a3f0f | |
| parent | 98b4477869894b11766edc42ba6364ff647f9882 [diff] | |
| parent | 0b72fa9cfe8ebe5726057e238a1eaeb948eb5d27 [diff] |
Merge "Remove explicit dependency on conscrypt" am: 92ed75c5f7 Change-Id: I46191c34b492a7ccb4c679a8e5d133d29a407b15