| commit | b117600cc6a94db465c66c3e5fc5420fa046aa2f | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Dec 05 22:40:33 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:40:33 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | 7ac1ec43436ecd69452abfb0dae0ad22a3a5130c [diff] | |
| parent | f3aca5f7ca94aad3f0fe7068762474e8e3f98894 [diff] |
am f3aca5f7: (-s ours) am 8418a309: am 89d16f75: am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev * commit 'f3aca5f7ca94aad3f0fe7068762474e8e3f98894':