OSDN Git Service

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

Trivial merge