OSDN Git Service

am 87ddfee6: Merge change I7b6fdc2d into eclair-mr2
authorBen Murdoch <benm@google.com>
Wed, 11 Nov 2009 23:32:22 +0000 (15:32 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 11 Nov 2009 23:32:22 +0000 (15:32 -0800)
commit723d306ebb6af81f9e5b06e3ec93888cbe7c3580
tree0f42ff1ae3fa7146d6490c54a9b9ec7f654e3eb2
parent06d5b77cd6176865410e3edfb638d68bbe8ebe1d
parent87ddfee675a35a132cad188268a46f96ca9d479e
am 87ddfee6: Merge change I7b6fdc2d into eclair-mr2

Merge commit '87ddfee675a35a132cad188268a46f96ca9d479e'

* commit '87ddfee675a35a132cad188268a46f96ca9d479e':
  Fix a diff between our tree and the upstream WX port.