OSDN Git Service

Merge branch 'master' into honeycomb-release
authorThe Android Automerger <android-build@android.com>
Thu, 14 Oct 2010 20:30:31 +0000 (13:30 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 14 Oct 2010 20:30:31 +0000 (13:30 -0700)

Trivial merge