tree e8821585a226eb25b7a3d90ec901404bfcf641fa
parent 1480108d05f37b7ae50dab68eb9e3c1eca3519f6
parent 7014da74e861f8cfc34fcbd528b4c83a1dc97503
author Neil Fuller <nfuller@google.com> 1421760571 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421760571 +0000

am 7014da74: resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp

* commit '7014da74e861f8cfc34fcbd528b4c83a1dc97503':
  Changes associated with an OkHttp upgrade