tree ae2ac3d31faf1fc8fa332cd2daec965784af759b
parent ab18df4385d7a259e23c7c034baf79f5c866323d
parent df2c498a3d4dc641c7b609873adf905848ace382
author Neil Fuller <nfuller@google.com> 1434362914 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434362914 +0000

am df2c498a: Apply upstream changes for timeout / pooled connection issue

* commit 'df2c498a3d4dc641c7b609873adf905848ace382':
  Apply upstream changes for timeout / pooled connection issue