commit 511eaf802a6e7599ec43843baf0b6348b3cc3bed
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 37e7312e12a1ac3f1f98a1fcf18192682fce9a66
parent f9a676ac52a00a2df3211a2f51da24481ed13d01

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

* commit 'f9a676ac52a00a2df3211a2f51da24481ed13d01':
  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...