am 989bbbdd: resolved conflicts for merge of 639aed71 to klp-dev-plus-aosp

Browse Source

* commit '989bbbdddc450a8e380b5f5318bb6e38a89637ae':
  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 8fa42e3cfb 989bbbdddc

commit bfe9d334c4

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