OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Mon, 27 Sep 2010 14:41:46 +0000 (07:41 -0700)
committerThe Android Automerger <android-build@android.com>
Mon, 27 Sep 2010 14:41:46 +0000 (07:41 -0700)

Trivial merge