OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Wed, 6 Oct 2010 15:00:48 +0000 (08:00 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 6 Oct 2010 15:00:48 +0000 (08:00 -0700)

Trivial merge