OSDN Git Service

Merge branch 'froyo' into froyo-release
authorThe Android Automerger <android-build@android.com>
Fri, 11 Jun 2010 18:47:08 +0000 (11:47 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 11 Jun 2010 18:47:08 +0000 (11:47 -0700)

Trivial merge