OSDN Git Service

merge from froyo-plus-aosp
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:35:51 +0000 (11:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:35:51 +0000 (11:35 -0700)
commitaed0cae0554fdecf9bfcf7e0b50f461dea9d7a46
treed42be173a6d795a39e514db00d2ea1419d336d2a
parent9da3110960bb50e8e00fb27d013d517bdd9407f5
parent5c4c784bd7f5e7c678ac6d8312f11f65b9be7003
merge from froyo-plus-aosp

Change-Id: I9cede57e10df9d6ba411b2960a77d7b9b60a1489