tree 388461413653ff35ad2673e28559c8b5e8bac408
parent f5f75cd8f22b3d2986d0e782f6ca4a6bbfeabc21
parent 7c00be48fcb1986db14915beef549e925b5670d2
author Wink Saville <wink@google.com> 1376007032 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376007032 -0700

am 7c00be48: am 55adb390: am 35152f13: Merge "Have CaptivePortalTracker use gservices updateable provisioning urls." into jb-mr2-dev

* commit '7c00be48fcb1986db14915beef549e925b5670d2':
  Have CaptivePortalTracker use gservices updateable provisioning urls.