tree 650fed308159157b9c0f19be37646fa69e5b7f02
parent 97d6f18c3aec828ecc249cc4c8ab1ede81dde5bc
parent 1db7024c50abe49d8881d458b3317ccff3de1832
author Robert Greenwalt <rgreenwalt@google.com> 1380918998 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380918998 -0700

am 1db7024c: am 2e23484e: am f3f1a370: Merge "Un-deprecate getDhcpInfo" into klp-dev

* commit '1db7024c50abe49d8881d458b3317ccff3de1832':
  Un-deprecate getDhcpInfo