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)
* commit '18cbfecd8ab587fa049dfc668755a6bd6ddb10d9':
  DO NOT MERGE Avoid nullifying dhcp target


Trivial merge