OSDN Git Service

Merge branch 'froyo' into froyo-release
authorThe Android Automerger <android-build@android.com>
Thu, 6 May 2010 05:11:33 +0000 (22:11 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 6 May 2010 05:11:33 +0000 (22:11 -0700)

Trivial merge