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)
* commit '7d8c2811e3604acfd6acfd2f7022919a633b394f':
  Add dns proxy controls from opensource.


Trivial merge