tree b79c50c399437342228736ceb840c23e8df79d39
parent 92e5fad83720e1cc7b01812f8be39e8f11b07e9b
parent 25d659641d20f4ad0b94bb8301cb637edf119129
author Narayan Kamath <narayan@google.com> 1377100379 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377100379 -0700

am 25d65964: Merge "Update test exercising broken proxy behaviour." into klp-dev

* commit '25d659641d20f4ad0b94bb8301cb637edf119129':
  Update test exercising broken proxy behaviour.