OSDN Git Service

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

Trivial merge