| commit | 8fa42e3cfb2a42090522fcbf804ae19849a304fb | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Wed Nov 13 18:47:57 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 13 18:47:57 2013 -0800 |
| tree | acf6e918ab3cb2e951d01cbe330c6c961ba6ad60 | |
| parent | f4f53e0f33b23c64d90cf4d568a5674f2003cd80 [diff] | |
| parent | 2a1fb433e5ed5d5fd52f7018483481fc6aac9435 [diff] |
am 2a1fb433: am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev * commit '2a1fb433e5ed5d5fd52f7018483481fc6aac9435': Fix for the invalid Global Proxy Setting