tree 041755cbfa3a66fa53d478a70ca12d82cf620850
parent adacf70b8b8af499409fabdf462ad5659ab7fa4a
parent 7ce8ca46985d7a0f0eb32b50d5a152f8e51496dd
author Neil Fuller <nfuller@google.com> 1431023222 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431023222 +0000

am 7ce8ca46: Reduce flakiness of OkHttp tests automerge: 81ed04a automerge: b8b31e4

* commit '7ce8ca46985d7a0f0eb32b50d5a152f8e51496dd':