tree 117c24d18820a17151c60175b02b9c33c8ee73c4
parent 8098bfac6a08d59697e308a524f96f69e482ecf7
parent f76b5383cd568dcfafb6819449b846ff76072c44
author Robert Greenwalt <rgreenwalt@google.com> 1380921438 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380921438 -0700

am f76b5383: DO NOT MERGE Un-deprecate getDhcpInfo

* commit 'f76b5383cd568dcfafb6819449b846ff76072c44':
  DO NOT MERGE Un-deprecate getDhcpInfo