OSDN Git Service

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

Trivial merge