commit | 4d5c09aad924d54d7cc1b8dba52ec558cb7b6c02 | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Wed Oct 18 11:21:18 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 18 11:21:18 2017 +0000 |
tree | d9b9013e488019f18424eed4094977dff385f1c3 | |
parent | 7aaf1eec54540bce348dafb89ad2fb1f118dba36 [diff] | |
parent | 94ddb28a26cc32ad5e028daa27bfdda0b802c8f9 [diff] |
Merge "Follow renames of conscrypt and bouncycastle to remove -host suffix" am: f4f94ab567 am: 94ddb28a26 Change-Id: I4acf23d85165cc5b2088183bb2ed2220b98fe4c3