tree cbf909549a7a632eb010721d6c26067f0f188022
parent 953442280d1a339fdbb1496a195e9ddb18ffcbde
parent 4d5c09aad924d54d7cc1b8dba52ec558cb7b6c02
author Colin Cross <ccross@android.com> 1508327866 +0000
committer android-build-merger <android-build-merger@google.com> 1508327866 +0000

Merge "Follow renames of conscrypt and bouncycastle to remove -host suffix" am: f4f94ab567 am: 94ddb28a26
am: 4d5c09aad9

Change-Id: I5124abc4f48bea0931a75a9eef2133411e809a7b