am 20a290e8: resolved conflicts for merge of 94a718f8 to klp-dev-plus-aosp

Browse Source

* commit '20a290e8acc9dcdae5012249823e2d84e4545e34':
  Fix for the invalid Global Proxy Setting

...

This commit is contained in:

Robert Greenwalt

2013-11-13 18:48:31 -08:00

committed by Android Git Automerger

parent 3cfa4fad96 20a290e8ac

commit 7a7fdbc44e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available