OSDN Git Service

Merge branch 'froyo' into froyo-release
authorThe Android Automerger <android-build@android.com>
Thu, 20 May 2010 19:28:03 +0000 (12:28 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 20 May 2010 19:28:03 +0000 (12:28 -0700)

Trivial merge