OSDN Git Service

merge from froyo-plus-aosp
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 7 Jun 2010 23:43:33 +0000 (16:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 7 Jun 2010 23:43:33 +0000 (16:43 -0700)
commitcc303b81e4906d57cbe81c13dc446ad71bce7639
tree857f55220606f16c0932484c2c2ea573b2d6694d
parentdb974ee7bdb28bbdf733b6d9f94b2f5edcd4de26
parent7acf0f37266de5b29a8f14d48d7170cef30cdabf
merge from froyo-plus-aosp

Change-Id: I2143b0ab6c94047d36d83a734985e9dfa67efda3