tree c189cff41eafac1285a03ef41db492d648c07f9c
parent 4dc9601f3ebe457746445283a6ec224d45bbd8ae
parent 74a968d084559e865f62a5a53fb27b5b91ba834d
author Neil Fuller <nfuller@google.com> 1423504454 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423504454 +0000

am 74a968d0: am 75a7afac: Reduce flakiness of OkHttp tests

* commit '74a968d084559e865f62a5a53fb27b5b91ba834d':
  Reduce flakiness of OkHttp tests