| commit | 265e14bcedd0f10744c79e7ecb40d2d064602b83 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue May 03 16:20:09 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 03 16:20:09 2011 -0700 |
| tree | ebef1912e993540628a612611ecb6e030a70297c | |
| parent | 71882977e663bf398a7ffd1e55c29f0c80021ae2 [diff] | |
| parent | 55aa7321e4b24a40766cccc11e8166546b01a3fd [diff] |
am 55aa7321: am e274a9fa: Merge "Tracking change to dns proxy protocol" * commit '55aa7321e4b24a40766cccc11e8166546b01a3fd': Tracking change to dns proxy protocol