OSDN Git Service

Merge branch 'master' into froyo-release
authorThe Android Automerger <android-build@android.com>
Wed, 17 Feb 2010 16:12:20 +0000 (08:12 -0800)
committerThe Android Automerger <android-build@android.com>
Wed, 17 Feb 2010 16:12:20 +0000 (08:12 -0800)

Trivial merge