OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
81b1fa6
b9b4321
)
am b9b4321b: am 5191b859: Merge "In CaptiviePortalTracker a socket timeout is probabl...
author
Wink Saville
<wink@google.com>
Thu, 8 Aug 2013 22:46:49 +0000
(15:46 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 8 Aug 2013 22:46:49 +0000
(15:46 -0700)
* commit '
b9b4321b756ac6e44650031ebfe0134508f60eaa
':
In CaptiviePortalTracker a socket timeout is probably a captive portal.
Trivial merge