tree aa57a48b0576f2bb6a6908ac584ec6c939cd7df5
parent 5b44aece8cacafeedfa474533a04cca5e74f4ae5
parent 18cbfecd8ab587fa049dfc668755a6bd6ddb10d9
author Irfan Sheriff <isheriff@google.com> 1291660978 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291660978 -0800

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