OSDN Git Service

merge from open-source froyo
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 28 Jul 2010 18:24:38 +0000 (11:24 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 28 Jul 2010 18:24:38 +0000 (11:24 -0700)
Change-Id: I947332f4e978326309fe14d01875ebfe94405c9f


Trivial merge