OSDN Git Service

Merge branch 'froyo' into froyo-release
authorThe Android Automerger <android-build@android.com>
Wed, 28 Apr 2010 19:21:08 +0000 (12:21 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 28 Apr 2010 19:21:08 +0000 (12:21 -0700)

Trivial merge