tree 1ed074881f8e7cf52a1147788b37e297880b4dd8
parent 1608edd967bb954112fd8f01b8e4c30b8b43a5ee
parent a97e9df66daa3e970cc62f8149c039e7b17bb6fb
author Neil Fuller <nfuller@google.com> 1414602697 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414602697 +0000

am a97e9df6: am fe570694: Merge "Fixing broken OkHttp CTS test"

* commit 'a97e9df66daa3e970cc62f8149c039e7b17bb6fb':
  Fixing broken OkHttp CTS test