| commit | 25afee83d0363cfcbe3ab63818c1a015a9cb9498 | [log] [tgz] |
|---|---|---|
| author | Tobias Thierer <tobiast@google.com> | Mon Jul 03 17:08:19 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 03 17:08:19 2017 +0000 |
| tree | 49461180eb82769813f6cdd2478f991779ef9792 | |
| parent | a5ab7b802b7b93391362b233be0ed64433fa1598 [diff] | |
| parent | 253f2926a73191351e9f4f8b54e4b07adc700ec3 [diff] |
Merge "Reintroduce setConnectTimeout() warning lost in Android N." am: 253f2926a7 Change-Id: I8b26bef28826f646aff896f52b4f703aded304d1