OSDN Git Service

Merge branch 'froyo' into froyo-release
authorThe Android Automerger <android-build@android.com>
Thu, 3 Jun 2010 23:21:06 +0000 (16:21 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 3 Jun 2010 23:21:06 +0000 (16:21 -0700)

Trivial merge