am 9c8de733: Merge "DO NOT MERGE update current config with dhcp settings" into honeycomb-mr1

* commit '9c8de7331475ef6f55449d95d0dfc6dcb425d116':
  DO NOT MERGE update current config with dhcp settings
This commit is contained in:
Irfan Sheriff 2011-03-04 00:15:28 -08:00 committed by Android Git Automerger
commit a9e7cd1efe

Diff Content Not Available