tree f5b5c054c92c4466b125c6ffb258ac39e253182a
parent 8ac3cacacbaeef6e0ba8b5f8e56a7b0d090e2803
parent 8accf27e98fba81d943f6e9e63839916469e2bbf
author James Ring <sjr@google.com> 1450718943 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1450718943 +0000

Merge "disable openssl for android/amd64"