OSDN Git Service

am 7d8c2811: am a45de8a8: Add dns proxy controls from opensource.
authorRobert Greenwalt <rgreenwalt@google.com>
Wed, 27 Jul 2011 01:37:00 +0000 (18:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 Jul 2011 01:37:00 +0000 (18:37 -0700)
commit1bb28f46f995a3768c2bb6aafb2fb2bdfb820d6c
treeead949ac82f199f6fb884fe6736903672e7afb1a
parent01e182f704b07d0763c0906ab3b706bcf6928896
parent7d8c2811e3604acfd6acfd2f7022919a633b394f
am 7d8c2811: am a45de8a8: Add dns proxy controls from opensource.

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