OSDN Git Service

merge from open-source froyo
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Jul 2010 18:38:12 +0000 (11:38 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Jul 2010 18:38:17 +0000 (11:38 -0700)
commit678966d7694d0c69c933bc7ff14886012358c200
tree9c2501a7ad39025cbba243b8c80496063a8d4755
parent9a2f5113fd1db1e1605daad47b16b6f960045582
parentc45f4678481f1f38c969989cebbd4c3bd25d6667
merge from open-source froyo

Change-Id: If4c03c5f5492deb0c99925e8097a8670061a3a2e