OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Thu, 7 Oct 2010 13:44:56 +0000 (06:44 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 7 Oct 2010 13:44:56 +0000 (06:44 -0700)

Trivial merge