OSDN Git Service

merge from froyo-plus-aosp
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 25 Jun 2010 16:42:59 +0000 (09:42 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 25 Jun 2010 16:42:59 +0000 (09:42 -0700)
Change-Id: If7ea7cb45a74560ef46f771e25b75a1c03417f27


Trivial merge