tree b08429ffd0e89cf590cf9b664afe5c0569cd25a8
parent 6ed7bfda87105ff7c99176b4b63099100bcbf752
parent 939def7d917b576b106f76f7cf461a14c3eae1f3
author Robert Greenwalt <rgreenwalt@google.com> 1380918845 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380918845 -0700

am 32c9cd84: am 939def7d: Merge "Don\'t redirect dns to an iface without dns servers" into klp-dev

* commit '32c9cd84034512f54fe05c66fd73279c8f1ca596':
  Don't redirect dns to an iface without dns servers