OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Tue, 7 Dec 2010 15:21:00 +0000 (07:21 -0800)
committerThe Android Automerger <android-build@android.com>
Tue, 7 Dec 2010 15:21:00 +0000 (07:21 -0800)

Trivial merge