OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Fri, 1 Oct 2010 14:23:30 +0000 (07:23 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 1 Oct 2010 14:23:30 +0000 (07:23 -0700)

Trivial merge