tree de76f0659b431fe1e03e9f8a26358b2356486640
parent 0c9bd036629fc9f6864bb6964c242b6f7095a82c
parent fdaf90ab1738bb4c9368ff1628600b5a1a768860
author Neil Fuller <nfuller@google.com> 1416589804 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416589804 +0000

am fdaf90ab: Merge "Fixes associated with OkHttp fallback changes"

* commit 'fdaf90ab1738bb4c9368ff1628600b5a1a768860':
  Fixes associated with OkHttp fallback changes