diff options
| author | Wink Saville <wink@google.com> | 2013-08-08 17:12:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-08 17:12:30 -0700 |
| commit | 94e9e8f16a7a72d1491694b44006b96212d8076e (patch) | |
| tree | 640499f5ed5430ce9248558ad8b777dce5c67149 /docs/html/sdk/api_diff/19/changes | |
| parent | 1c7799e2f35b707c5f5d6544a6d94cd4892891da (diff) | |
| parent | f5f75cd8f22b3d2986d0e782f6ca4a6bbfeabc21 (diff) | |
am f5f75cd8: Merge "Merge commit \'81132d51\' into fix-merge-conflict" into klp-dev
* commit 'f5f75cd8f22b3d2986d0e782f6ca4a6bbfeabc21':
In CaptiviePortalTracker a socket timeout is probably a captive portal.
Diffstat (limited to 'docs/html/sdk/api_diff/19/changes')
0 files changed, 0 insertions, 0 deletions