tree 19e98959e2e7ab3d3c2705f3a7ee29d35a4ac637
parent 6b2511bf62c02994d36c0ec4af459ebb8fb8505f
parent 00de455447fb6d122f97b1dcc9d8f74998967c86
author Neil Fuller <nfuller@google.com> 1411119502 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411119502 +0000

am 00de4554: (-s ours) Merge "external/okhttp changes to support connection pool flushing"

* commit '00de455447fb6d122f97b1dcc9d8f74998967c86':
  external/okhttp changes to support connection pool flushing