OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Aug 2010 22:35:31 +0000 (15:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Aug 2010 22:35:31 +0000 (15:35 -0700)
commitc32b912e8d254f9d659cbe3d84e430e1d1e5b9e7
treef328faa91e370d4577cedbc93a4b1460fd7bb7b8
parent33eba03557c1955bf988fb07ff7d9a7a95da91ae
parentbee24b884b4f53cc55ed544d5dfc3da381ad5970
merge from open-source master

Change-Id: I86b16a803691187dc9311509042bcca68a2a9ac1