OSDN Git Service

Merge branch 'master' into froyo-release
authorThe Android Automerger <android-build@android.com>
Thu, 25 Mar 2010 15:25:54 +0000 (08:25 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 25 Mar 2010 15:25:54 +0000 (08:25 -0700)

Trivial merge