OSDN Git Service

Merge "Tracking change to dns proxy protocol"
authorBrian Carlstrom <bdc@google.com>
Tue, 3 May 2011 17:21:35 +0000 (10:21 -0700)
committerAndroid Code Review <code-review@android.com>
Tue, 3 May 2011 17:21:35 +0000 (10:21 -0700)
commite274a9fac077d350391b721e9a08b650b243577e
treeffa71abe793f750f6f4ff1b2a94120d5c68546f4
parentd004dc9957cd8944d3db8ed92544c8ee65b117ca
parentbe7f5da0bdbfdd03c4fdceb827c15fc0b5c21792
Merge "Tracking change to dns proxy protocol"