| commit | 02e2ffc88cff5cd80d6ccbc544553e61ef423a4d | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Wed Mar 30 16:40:30 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 30 16:40:30 2011 -0700 |
| tree | 46fcde2521016d0406c12e203472c99f5b64c57d | |
| parent | 1a868d36c6d5a832bdd662ae26f62f37ff833ed8 [diff] | |
| parent | b57cb5bfb7473638b1a6e7b8a099ab8929dccd0d [diff] |
am c48dfd5d: (-s ours) am 11ebb6f5: (-s ours) am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread * commit 'c48dfd5db6fa956be603d3c7479e3f672daea30e': DO NOT MERGE Pick upstream intf with valid IP conf