| commit | c48dfd5db6fa956be603d3c7479e3f672daea30e | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Wed Mar 30 15:18:23 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 30 15:18:23 2011 -0700 |
| tree | e5bf64a0057c264bca6e5f44e541025579dc76e0 | |
| parent | 047f9d12976d90d0931a64a256bb4843d77f5e20 [diff] | |
| parent | 11ebb6f5020761b9b8373a5e0d777fb91a2b92c2 [diff] |
am 11ebb6f5: (-s ours) am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread * commit '11ebb6f5020761b9b8373a5e0d777fb91a2b92c2': DO NOT MERGE Pick upstream intf with valid IP conf