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