tree 5cfe5624c37538337021e72bac2dc914e62abafd
parent 51ff2b0d9e50b7c4a3031676bf42bf551e96b19e
parent 319323d7b06dd8d80a6ecc646d7c61a4d4a77a29
author Robert Greenwalt <rgreenwalt@google.com> 1381108749 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381108749 -0700

am 8070ffcc: am 319323d7: am 8fbc8797: (-s ours) am 202965ca: am 5b41b261: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo

* commit '8070ffccbbb55721edd4ac014d6a675439a9926e':
  DO NOT MERGE Un-deprecate getDhcpInfo