| commit | bfe9d334c4cf612d6cca4e36206cf278e9b63b5c | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Wed Nov 13 18:48:31 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 13 18:48:31 2013 -0800 |
| tree | acf6e918ab3cb2e951d01cbe330c6c961ba6ad60 | |
| parent | 8fa42e3cfb2a42090522fcbf804ae19849a304fb [diff] | |
| parent | 989bbbdddc450a8e380b5f5318bb6e38a89637ae [diff] |
am 989bbbdd: resolved conflicts for merge of 639aed71 to klp-dev-plus-aosp * commit '989bbbdddc450a8e380b5f5318bb6e38a89637ae': Fix for the invalid Global Proxy Setting