commit db5cb489201eb724222d7d5ad4f4e1337e3320b9
author The Android Open Source Project <initial-contribution@android.com> Wed Aug 14 12:16:21 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 14 12:16:21 2013 -0700
tree 6b413911333186f92c30ac31bf198d11ce951d9f
parent 69e2de0a4e9973174eb890b88350eaa288646be5
parent 754e08030d6c473485f0c331d4914bed0144b6e6

am 754e0803: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge

* commit '754e08030d6c473485f0c331d4914bed0144b6e6':
  Use hostname verifier directly instead of instance DO NOT MERGE
  If in a mobile captive portal is detected enable fail fast.
  Have CaptivePortalTracker use gservices updateable provisioning urls.
  In CaptiviePortalTracker a socket timeout is probably a captive portal.
  Check that hipri has started.
  Fix issue #10226007: Reset apps restores most of the changed settings...
  Fix issue #10226007: Reset apps restores most of the changed settings...