OSDN Git Service

merge from froyo-plus-aosp
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 7 Jun 2010 18:19:33 +0000 (11:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 7 Jun 2010 18:19:33 +0000 (11:19 -0700)
commit7980f585f7848660c5aebf93d93b541f0026be8c
tree425d8a127de1346c11250e331bff11f790231cb1
parenta8a21488630980c1d2a2152d0ac39bd7978879e2
parent15956f92880d9e08a4eb9aeee528b990a0487fbe
merge from froyo-plus-aosp

Change-Id: I54d3b035f378d92f287b3dd08987c4041fda9997