| commit | 84527eca759495b4a5514edbea9a56b907992a42 | [log] [tgz] |
|---|---|---|
| author | Paul Jensen <pauljensen@google.com> | Tue Oct 07 00:32:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 00:32:00 2014 +0000 |
| tree | 78bf9ed9a151811bfa51670a1d89cb5a73ff4439 | |
| parent | f2bef9cd1936c5d26d88c17b56746361af6e78f3 [diff] | |
| parent | 69c489ed6f28cb3c79f13b2f7b6cffc6d3b49627 [diff] |
am 69c489ed: am 7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev * commit '69c489ed6f28cb3c79f13b2f7b6cffc6d3b49627': Use network-specific HTTP proxy settings in captive portal login app.