OSDN Git Service

Merge branch 'master' into froyo-release
authorThe Android Automerger <android-build@android.com>
Fri, 29 Jan 2010 16:09:31 +0000 (08:09 -0800)
committerThe Android Automerger <android-build@android.com>
Fri, 29 Jan 2010 16:09:31 +0000 (08:09 -0800)

Trivial merge