diff options
| author | Paul Jensen <pauljensen@google.com> | 2014-10-06 23:52:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-06 23:52:12 +0000 |
| commit | 69c489ed6f28cb3c79f13b2f7b6cffc6d3b49627 (patch) | |
| tree | f1385318380959fdb0db90f78749a274c5d54315 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1d593ad47470150f751cc573eb56dae97470cf41 (diff) | |
| parent | 7627d2cd5cd93ebf8e683392edbef961dbc20d31 (diff) | |
am 7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev
* commit '7627d2cd5cd93ebf8e683392edbef961dbc20d31':
Use network-specific HTTP proxy settings in captive portal login app.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions