commit | 25c89ef995f7b933d38c016b705e29245014da15 | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Wed Aug 21 08:52:59 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 21 08:52:59 2013 -0700 |
tree | b79c50c399437342228736ceb840c23e8df79d39 | |
parent | 92e5fad83720e1cc7b01812f8be39e8f11b07e9b [diff] | |
parent | 25d659641d20f4ad0b94bb8301cb637edf119129 [diff] |
am 25d65964: Merge "Update test exercising broken proxy behaviour." into klp-dev * commit '25d659641d20f4ad0b94bb8301cb637edf119129': Update test exercising broken proxy behaviour.