am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread

Browse Source

* commit '05f14e2bcf78be62b35e85902408ea66103a3881':
  DO NOT MERGE Pick upstream intf with valid IP conf

...

This commit is contained in:

Irfan Sheriff 2011-03-30 09:30:32 -07:00 committed by Android Git Automerger

parent 4f90fda71f fce4eab91a

commit 51af9642fd

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

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

Diff Content Not Available