tree bead30ebf010a3a9e1357690ff5b99a5f4b5ccbb
parent 751d617e29f9af90c7b4f41e24affe281441976d
parent 99e31cc1cb87fe51442c2d2b395f9dccb755fe43
author Neil Fuller <nfuller@google.com> 1395414733 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395414733 +0000

am 99e31cc1: Merge "Pull upstream fixes from OkHttp"

* commit '99e31cc1cb87fe51442c2d2b395f9dccb755fe43':
  Pull upstream fixes from OkHttp