tree f536e2d74d633de2f2e13868f137dc6dea9d2e29
parent 2ce22dd5000248090917fc5ead206603c2ae3e4a
parent af2f34adfd71401c6cc8c827e0e509263c2a72d9
author Robert Greenwalt <rgreenwalt@google.com> 1381883825 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381883825 -0700

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

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