OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Mon, 13 Sep 2010 15:31:22 +0000 (08:31 -0700)
committerThe Android Automerger <android-build@android.com>
Mon, 13 Sep 2010 15:31:22 +0000 (08:31 -0700)

Trivial merge