commit | b974e23410f2a6b90dbcce57ce94c2afd73bc9ed | [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 | c87418ddc4c5370b3b744110f569d4b208310253 | |
parent | aab7d3b2923676a8a9fe49d23c3ac2b51ddbefdc [diff] | |
parent | 2e617a74056b642b6c4b66ab5d6b1585c44a7c10 [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