OSDN Git Service

Merge branch 'froyo' into froyo-release
authorThe Android Automerger <android-build@android.com>
Wed, 9 Jun 2010 00:10:05 +0000 (17:10 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 9 Jun 2010 00:10:05 +0000 (17:10 -0700)

Trivial merge