tree 6c6ec8afc0f42c4f81067d83345fc10d7d9825f7
parent 97ac713258fdac3ddb6963e68450316a4ca35116
parent 458430d823babdbe05a22e82b976c08d0e91f9c5
author Robert Greenwalt <rgreenwalt@google.com> 1381104660 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381104660 -0700

am 458430d8: (-s ours) am 5ab9af41: am f76b5383: DO NOT MERGE Un-deprecate getDhcpInfo

* commit '458430d823babdbe05a22e82b976c08d0e91f9c5':
  DO NOT MERGE Un-deprecate getDhcpInfo