OSDN Git Service

merge from froyo-plus-aosp
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 21 Jun 2010 18:14:15 +0000 (11:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 21 Jun 2010 18:14:15 +0000 (11:14 -0700)
commite6d315ede7ac0c72fe23be9be5c89adff61416c0
treebe64c18c41a9f459562800572f32792a2a15f648
parentb15879a589bb5ce350869e1a735840679e4b2aaa
parentda137cc04c2b421b0e1d86d4b75fcd39a1dd6c9d
merge from froyo-plus-aosp

Change-Id: I52f5bbe1b0b7d9cda30d8ae62236e85e3d4e3631