OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Thu, 17 Jun 2010 16:07:17 +0000 (09:07 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 17 Jun 2010 16:07:17 +0000 (09:07 -0700)

Trivial merge