commit | be1e0715aeba3a552e42844722fe1c157b1b25e6 | [log] [tgz] |
---|---|---|
author | Neil Fuller <nfuller@google.com> | Wed Oct 03 06:22:18 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 03 06:22:18 2018 -0700 |
tree | 25d08137664f9f7381afe253e683524dfbfed003 | |
parent | b7db79becc33b32daf5f71e6e06a37d6f994eb1b [diff] | |
parent | 7fe0ebc875e5a6662a3e70f7232ff3fb6a0898f5 [diff] |
Merge "Remove an unused dependency on conscrypt" am: 7fe2b3ec69 am: 7fe0ebc875 Change-Id: Ib7ffd88fca3abed521bcf8e44218e2c7e0ba4c85