OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Wed, 1 Dec 2010 15:21:59 +0000 (07:21 -0800)
committerThe Android Automerger <android-build@android.com>
Wed, 1 Dec 2010 15:21:59 +0000 (07:21 -0800)

Trivial merge