OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Tue, 2 Nov 2010 15:24:15 +0000 (08:24 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 2 Nov 2010 15:24:15 +0000 (08:24 -0700)

Trivial merge