commit | 2a1fb433e5ed5d5fd52f7018483481fc6aac9435 | [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 | b6344cefc4ebdcbb050681a569f2933704a00a77 [diff] | |
parent | 08e512b425be50caeefb7ccebf971c06e7557cfb [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