tree 6e1fd05f4c0d60b5b51c85786b59cd0413c8138e
parent eaa7cc9884017d9523cf41e5359da1b2d4ed9159
parent 4b3b89ec763899390b15461dd6617bb4ed6fe846
author Brian Carlstrom <bdc@google.com> 1304362563 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304362563 -0700

am 4b3b89ec: am c5a3f770: Tracking change to dns proxy protocol

* commit '4b3b89ec763899390b15461dd6617bb4ed6fe846':
  Tracking change to dns proxy protocol