OSDN Git Service

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

Trivial merge