| commit | b42fb03b7958896ed774cb471fb5d8830eb3c1ec | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Thu Sep 20 13:39:30 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 20 13:39:30 2012 -0700 |
| tree | edec98e13e994f0d59e64fcaccd1d7b89dabeab9 | |
| parent | 1d824dfdda206efd01274cba4c95273e3c161b0b [diff] | |
| parent | 6c0fcc961e1650113947918dc105c2a459ebf40d [diff] |
am 6c0fcc96: am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev * commit '6c0fcc961e1650113947918dc105c2a459ebf40d': Captive check for both mobile and wifi