| commit | 1bb28f46f995a3768c2bb6aafb2fb2bdfb820d6c | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Tue Jul 26 18:37:00 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 26 18:37:00 2011 -0700 |
| tree | ead949ac82f199f6fb884fe6736903672e7afb1a | |
| parent | 01e182f704b07d0763c0906ab3b706bcf6928896 [diff] | |
| parent | 7d8c2811e3604acfd6acfd2f7022919a633b394f [diff] |
am 7d8c2811: am a45de8a8: Add dns proxy controls from opensource. * commit '7d8c2811e3604acfd6acfd2f7022919a633b394f': Add dns proxy controls from opensource.