OSDN Git Service

am 0aaed034: am ca6bb022: (-s ours) Merge change Ie805d2fa into eclair-sdk
authorXavier Ducrohet <xav@android.com>
Thu, 19 Nov 2009 18:52:54 +0000 (10:52 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Nov 2009 18:52:54 +0000 (10:52 -0800)
commitd9c2b91c66391272226687e63416a5b71fc0b38d
tree7568f6f0c2a4d0fc85b5b38fabd40b274b7b3d1a
parent0078a8028baacc1c0636521edd3259ce82bae549
parent0aaed034094ace5d96ffb92f8094b508bf8a8513
am 0aaed034: am ca6bb022: (-s ours) Merge change Ie805d2fa into eclair-sdk

Merge commit '0aaed034094ace5d96ffb92f8094b508bf8a8513' into eclair-plus-aosp

* commit '0aaed034094ace5d96ffb92f8094b508bf8a8513':
  Move Eclipse plug-ins to 0.9.5 (do not merge)