tree 8cc3d2f890ef95bac4d55a02c7ca6576b5795076
parent e02a37d0466d101d345421542cdeeea431415ec4
parent b34d45ad65524e3cd1d9b77963b8dc25beced5c2
author Treehugger Robot <treehugger-gerrit@google.com> 1508319671 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1508319671 +0000

Merge "Follow renames of conscrypt and bouncycastle to remove -host suffix"