tree bf501f452b039ca6dfb3dd64d5d795805201172f
parent 33379fb317143d6c766873364012622bef2af1e7
parent aa546ae97723ffd5400279f566f6e9c591a389d8
author Robert Greenwalt <rgreenwalt@google.com> 1381884063 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381884063 -0700

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

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