am c48dfd5d: (-s ours) am 11ebb6f5: (-s ours) am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread

Browse Source

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

...

This commit is contained in:

Irfan Sheriff 2011-03-30 16:40:30 -07:00 committed by Android Git Automerger

parent 1a868d36c6 b57cb5bfb7

commit 02e2ffc88c

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