tree f49b7b3438d39693db9226e88cd7caf064765964
parent 9c4976e0f2bbb584a52c0c5b3924080e27a0a7be
parent 32e3f8e4bf976b7e451e9871ce51910a877e86ae
author Chad Brubaker <cbrubaker@google.com> 1474928524 +0000
committer android-build-merger <android-build-merger@google.com> 1474928524 +0000

Merge "Avoid using SSLv3 in tests" am: 6d7ae7b0fc
am: 32e3f8e4bf

Change-Id: If62cfd4199661fbb08727f320961daec63f8e11e