OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Wed, 3 Nov 2010 22:34:27 +0000 (15:34 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 3 Nov 2010 22:34:27 +0000 (15:34 -0700)

Trivial merge