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)
commit5439ba5780631d04fcded7c605eb00271b1a449c
tree06c8624c5f06f7b9c3652ff2822a5e24250e7809
parenta0d4e42958ed95315f5c949db99c9a11db3ba120
parent3814d25de0f56d0ef2fde91b690cb110f8c915cf
merge from froyo-plus-aosp

Change-Id: If7ea7cb45a74560ef46f771e25b75a1c03417f27