| commit | 02047f7e88f1d78b29d6d93dc521df279398505d | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Mon Dec 06 10:42:58 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 06 10:42:58 2010 -0800 |
| tree | aa57a48b0576f2bb6a6908ac584ec6c939cd7df5 | |
| parent | 5b44aece8cacafeedfa474533a04cca5e74f4ae5 [diff] | |
| parent | 18cbfecd8ab587fa049dfc668755a6bd6ddb10d9 [diff] |
am 18cbfecd: (-s ours) am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread * commit '18cbfecd8ab587fa049dfc668755a6bd6ddb10d9': DO NOT MERGE Avoid nullifying dhcp target