OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Mon, 8 Nov 2010 16:23:43 +0000 (08:23 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 8 Nov 2010 16:23:43 +0000 (08:23 -0800)

Trivial merge