OSDN Git Service

Merge branch 'master' into froyo-release
authorThe Android Automerger <android-build@android.com>
Mon, 11 Jan 2010 15:52:08 +0000 (07:52 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 11 Jan 2010 15:52:08 +0000 (07:52 -0800)

Trivial merge