OSDN Git Service

Merge branch 'froyo' into froyo-release
authorThe Android Automerger <android-build@android.com>
Wed, 26 May 2010 04:23:29 +0000 (21:23 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 26 May 2010 04:23:29 +0000 (21:23 -0700)

Trivial merge