OSDN Git Service

merge from froyo-plus-aosp
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 21 Jun 2010 18:00:40 +0000 (11:00 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 21 Jun 2010 18:00:40 +0000 (11:00 -0700)
commit29d09a18c50a2dd9412ca393f2f5657d3199c414
treebd21200bce343b8c03f7dba3a40806539a2a620c
parent2f8cb6de03df5283bc5a5e3afc6ff729804e6bc9
parent906d47573bc1a4a180945da019538144bdb395b4
merge from froyo-plus-aosp

Change-Id: Icd2fa05c77fd2ec7c878520647e0024bf89b0504