OSDN Git Service

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

Trivial merge