OSDN Git Service

am 18cbfecd: (-s ours) am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target...
authorIrfan Sheriff <isheriff@google.com>
Mon, 6 Dec 2010 18:42:58 +0000 (10:42 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Dec 2010 18:42:58 +0000 (10:42 -0800)
commit3e327fbdf2f707ab701e9f97c1d5138e90be2ef8
tree0b58f551214399aeabda9e029818d4c4e9d1049d
parent27a3d0065799de36c36a67eec2f386c373b6c39e
parentfe1b942d68c5b3a399c8d5872db7f912e51b7a86
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