OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Fri, 8 Oct 2010 15:47:56 +0000 (08:47 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 8 Oct 2010 15:47:56 +0000 (08:47 -0700)

Trivial merge