OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Thu, 18 Nov 2010 19:05:11 +0000 (11:05 -0800)
committerThe Android Automerger <android-build@android.com>
Thu, 18 Nov 2010 19:05:11 +0000 (11:05 -0800)

Trivial merge