am 216a58c8: (-s ours) Merge "DO NOT MERGE Proxy and IP fixes" into honeycomb-mr1

Browse Source

* commit '216a58c882917926ccf450ae180c552d0de36a2b':
  DO NOT MERGE Proxy and IP fixes

...

This commit is contained in:

Irfan Sheriff

2011-03-04 01:00:06 -08:00

committed by Android Git Automerger

parent b81a56c79b 216a58c882

commit 55e790d56c

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