OSDN Git Service

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

Trivial merge