tree 9af964b98973e6b01ee3d924873976945465fc59
parent 32dd3cc0916c73fdc2228ffa9d56d9ec2e8f6151
parent 680a35ba19baf579c2d2da34442fac8b18002cd4
author Robert Greenwalt <rgreenwalt@google.com> 1381884063 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381884063 -0700

am 680a35ba: am ec4d5da6: am 1b7f99b9: Merge "Retry captiveportal check even if only one addr" into klp-dev

* commit '680a35ba19baf579c2d2da34442fac8b18002cd4':
  Retry captiveportal check even if only one addr