OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Fri, 12 Nov 2010 21:23:24 +0000 (13:23 -0800)
committerThe Android Automerger <android-build@android.com>
Fri, 12 Nov 2010 21:23:24 +0000 (13:23 -0800)

Trivial merge