OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Sun, 26 Sep 2010 19:59:23 +0000 (12:59 -0700)
committerThe Android Automerger <android-build@android.com>
Sun, 26 Sep 2010 19:59:23 +0000 (12:59 -0700)

Trivial merge