commit | 61efbf7f38292980ec5a2211d8341c1dfb07dfcc | [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 | 003a3971fbfff8b400c4d6e11f26bb344186199a | |
parent | 788baf6d24b7cbd450ecd40fb416a2ce7a646a52 [diff] | |
parent | f3df16221a7e5970dd2ece9220b2346622533864 [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