tree ec66658e24196d25439749e53fb6aa9fa37cfd45
parent 9e58a5c69dab094d3b5e50d7c903ce79c4b602aa
parent d1c79b97469b8364983ef20a8b1efe40860016ad
author Neil Fuller <nfuller@google.com> 1443644213 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443644213 +0000

am d1c79b97: am 8912339b: Merge changes from topic \'okhttpupgrade_afterm\'

* commit 'd1c79b97469b8364983ef20a8b1efe40860016ad':
  Android modifications to OkHttp
  Pull latest code from upstream okhttp and okio