tree 3b3efced64fe34c880b0ad17bc24202d0a6561ad
parent 95cd451ef1b1c7390ec08da730f6bf0b268ed833
author Irfan Sheriff <isheriff@google.com> 1348158761 -0700
committer Irfan Sheriff <isheriff@google.com> 1348168386 -0700

Captive check for both mobile and wifi

Bug: 7113195
Bug: 7102238
Bug: 7087564

Change-Id: Iac08db9de3935338ad498aa3983d2ca82057dda1