OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81b1fa6 b9b4321)
am b9b4321b: am 5191b859: Merge "In CaptiviePortalTracker a socket timeout is probabl...
authorWink Saville <wink@google.com>
Thu, 8 Aug 2013 22:46:49 +0000 (15:46 -0700)
committerAndroid 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
frameworks/base
About OSDN
Find Software
Develop Software
Help