| commit | 55aa7321e4b24a40766cccc11e8166546b01a3fd | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue May 03 16:14:51 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 03 16:14:51 2011 -0700 |
| tree | 1d9be3b5daa03386ebc1b93af075600ec1ea1f28 | |
| parent | 1af88c97432c88ec5b39d155e8c296d2a6eb1225 [diff] | |
| parent | e274a9fac077d350391b721e9a08b650b243577e [diff] |
am e274a9fa: Merge "Tracking change to dns proxy protocol" * commit 'e274a9fac077d350391b721e9a08b650b243577e': Tracking change to dns proxy protocol