Wink Saville f35f3201db Merge commit '81132d51' into fix-merge-conflict ...

* commit '81132d51':
  In CaptiviePortalTracker a socket timeout is probably a captive portal.

Change-Id: I624732a5c29427bc22a156ccd46e6ff727af09c5

2013-08-08 16:51:46 -07:00

..

java

Merge commit '81132d51' into fix-merge-conflict

2013-08-08 16:51:46 -07:00

jni

Use a single socket to communicate with supplicant

2013-08-08 18:38:53 +00:00

res

Update gps status icon to be a "high power" location icon.

2013-08-08 14:06:25 -07:00

tests

Merge "Simplify LinkPropertiesTest."

2013-08-08 02:54:29 +00:00