OSDN Git Service

Merge branch 'froyo' into froyo-release
authorThe Android Automerger <android-build@android.com>
Tue, 11 May 2010 01:11:58 +0000 (18:11 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 11 May 2010 01:11:58 +0000 (18:11 -0700)

Trivial merge