| commit | 84162a1cf6a9edd9c1ae2208f9d101e5a6ae39f2 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Wed Sep 30 20:04:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 30 20:04:38 2015 +0000 |
| tree | 6054fc8b6c009e5bc20f147783a1938f444ad867 | |
| parent | 627627ecef26ef3fd9a5ae5796e0c867bccc361d [diff] | |
| parent | cf987f3a8f4cebefff488e95d1253d4abef66b0f [diff] |
am cf987f3a: Merge "Changes associated with upstream OkHttp pull" * commit 'cf987f3a8f4cebefff488e95d1253d4abef66b0f': Changes associated with upstream OkHttp pull