OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Feb 2010 18:02:33 +0000 (10:02 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Feb 2010 18:02:33 +0000 (10:02 -0800)
commita38780c9858aee807a52ad5615da4d32a4bafca0
tree4f85caf41a75da8e7467e4b07a23f11c8554f168
parentadbe0586957a71d2aa9f100646882dbca1c78f12
parent769ccf5b59359d54301a3f99d511992e9cc78a45
merge from open-source master