OSDN Git Service

Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into...
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 30 Jul 2010 00:45:56 +0000 (17:45 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 30 Jul 2010 00:45:56 +0000 (17:45 -0700)

Trivial merge