OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Sun, 10 Oct 2010 23:22:50 +0000 (16:22 -0700)
committerThe Android Automerger <android-build@android.com>
Sun, 10 Oct 2010 23:22:50 +0000 (16:22 -0700)

Trivial merge