| commit | e64226dc4140cae60c90d74839fdbc45916a63df | [log] [tgz] |
|---|---|---|
| author | Tobias Thierer <tobiast@google.com> | Wed Jan 25 10:48:08 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 25 10:48:08 2017 +0000 |
| tree | 596aea6e32250865c9141c116649bd83e5a95c6f | |
| parent | 37945bf92500da8227f948904f57a96c7b25616c [diff] | |
| parent | 0b809cf8b16274578a3a82835404486718e44a7a [diff] |
Merge "OkHttp quick fix: canceled StreamAllocations can never recover" am: 390c78c5cd am: 66ef890399 am: 3e1f83e9f5 am: 0b809cf8b1 Change-Id: Ib9516599c31ecce369ef10470cd14f672310937b