From: Robert Greenwalt <rgreenwalt@google.com>
Date: Wed, 27 Jul 2011 01:37:00 +0000 (-0700)
Subject: am 7d8c2811: am a45de8a8: Add dns proxy controls from opensource.
X-Git-Tag: android-x86-7.1-r1~500
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1bb28f46f995a3768c2bb6aafb2fb2bdfb820d6c;p=android-x86%2Fsystem-netd.git

am 7d8c2811: am a45de8a8: Add dns proxy controls from opensource.

* commit '7d8c2811e3604acfd6acfd2f7022919a633b394f':
  Add dns proxy controls from opensource.
---

1bb28f46f995a3768c2bb6aafb2fb2bdfb820d6c