tree a34dbc2b663129cb3c4aa465a2be4d0a6928f46a
parent 37edf497cadb60779acea644619332652088965c
parent aabe1bf306c18873f9a2e70150e95ce1baacb609
author Robert Greenwalt <rgreenwalt@google.com> 1380918994 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380918994 -0700

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

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