OSDN Git Service

Merge branch 'froyo' into froyo-release
authorThe Android Automerger <android-build@android.com>
Mon, 29 Mar 2010 16:25:17 +0000 (09:25 -0700)
committerThe Android Automerger <android-build@android.com>
Mon, 29 Mar 2010 16:25:17 +0000 (09:25 -0700)

Trivial merge