OSDN Git Service

am f18a4274: am 6210c50d: am eef67346: Merge "Fix proxy expectation." into honeycomb
authorJesse Wilson <jessewilson@google.com>
Wed, 19 Jan 2011 06:13:50 +0000 (22:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Jan 2011 06:13:50 +0000 (22:13 -0800)
commit6985d6c9c9a21a736c7468aab790506335697c03
treeed23695de042ffd993db6cd61c2d7a69462bc2d9
parent25e0b5b03043e84feb90e3b270c5a11aa7b1e42c
parentf18a427413d1cea7e245256810346837bd88cd8c
am f18a4274: am 6210c50d: am eef67346: Merge "Fix proxy expectation." into honeycomb

* commit 'f18a427413d1cea7e245256810346837bd88cd8c':
  Fix proxy expectation.