OSDN Git Service

merge from froyo-plus-aosp
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:21:00 +0000 (11:21 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:21:00 +0000 (11:21 -0700)
commit9f431335ab377396713b8b386ad7539b2b28eff5
tree60e3889c7cb316024252ce7b8a10f98014773abd
parenta67baff9a50be3a335e650d208d51e33e20b70e2
parent5cbd5d9ff446f9d677ad4eabbdc019942cc84b6a
merge from froyo-plus-aosp

Change-Id: Ie8f2b137de580bfb23a1bdee513a8a20075e40a3