OSDN Git Service

merge from froyo-plus-aosp
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 7 Jun 2010 23:42:09 +0000 (16:42 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 7 Jun 2010 23:42:09 +0000 (16:42 -0700)
commitd0e428b8a20140f96c04b0a0b8f6e2747d1a9788
treef0ec9769bcf30567a876534af93900770a2f7095
parent6a9e2e94e4bf984181a2b5ed6401db9a8cec475b
parent33f7b83776042a0aa90d7cf9c548d07611b3db09
merge from froyo-plus-aosp

Change-Id: I58f1d905b3fa781e4f5827d4d7b9323a4cdcc04e