OSDN Git Service

merge from froyo-plus-aosp
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 25 Jun 2010 17:02:14 +0000 (10:02 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 25 Jun 2010 17:02:14 +0000 (10:02 -0700)
Change-Id: I006987d370377a0222dfc5b4cb24ad6441d717dc


Trivial merge