OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Mon, 15 Nov 2010 15:59:34 +0000 (07:59 -0800)
committerThe Android Automerger <android-build@android.com>
Mon, 15 Nov 2010 15:59:34 +0000 (07:59 -0800)

Trivial merge