OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Thu, 28 Oct 2010 14:11:46 +0000 (07:11 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 28 Oct 2010 14:11:46 +0000 (07:11 -0700)

Trivial merge