OSDN Git Service

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

Trivial merge