OSDN Git Service

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

Trivial merge