OSDN Git Service

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

Trivial merge