OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Thu, 4 Nov 2010 16:33:14 +0000 (09:33 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 4 Nov 2010 16:33:14 +0000 (09:33 -0700)

Trivial merge