| commit | 7627d2cd5cd93ebf8e683392edbef961dbc20d31 | [log] [tgz] |
|---|---|---|
| author | Paul Jensen <pauljensen@google.com> | Mon Oct 06 23:01:26 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 06 23:01:27 2014 +0000 |
| tree | 34913ac593f8fa520cbcf54e12119518aecf3163 | |
| parent | 6c9f0a01602697aaed99f54c4db0d6296701ed43 [diff] | |
| parent | 88eb0fa8eec7da1b7a3bd39f9d9844909911bc64 [diff] |
Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev