| commit | 7fdfe28c75e103b8a66b559dcb813576fbbf2eb5 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Wed Nov 13 16:29:12 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 13 16:29:12 2013 -0800 |
| tree | 26efd6a084a27dcc41e7e0781955072a932cf28e | |
| parent | 1fbb5da29a4ebef1d758dffad9c2704a5932d223 [diff] | |
| parent | 4c514f2a688bdae319c919987092ccfee690f390 [diff] |
am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev * commit '4c514f2a688bdae319c919987092ccfee690f390': Fix for the invalid Global Proxy Setting