tree 312ae96edd562e17c997bff89c229786c21e72eb
parent 9668dddd6f6ccb24455eb492db3949cb8e0fc694
parent 6fdcb168a7a0a4f508063019ca4d2ec35458f892
author Brian Carlstrom <bdc@google.com> 1365023215 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365023215 -0700

am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp."

* commit '6fdcb168a7a0a4f508063019ca4d2ec35458f892':
  Adjust the HttpResponseCache for OkHttp.