OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Wed, 29 Sep 2010 13:43:43 +0000 (06:43 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 29 Sep 2010 13:43:43 +0000 (06:43 -0700)

Trivial merge