OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 23 Nov 2010 22:10:42 +0000 (14:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 23 Nov 2010 22:10:42 +0000 (14:10 -0800)
commitac158d478822dfaa39d9a2b65733ffea7834864d
tree671e8a934deb4f28482cfc295da087741d153e5f
parent186bd435914fc0182930f1f9c233f8de5db3a58f
parent33620a2caa9a8d757eb5aa6b197577408a197410
merge from open-source master

Change-Id: I4b261c8bc0635174fb125ee68590b6b9f4c7b5db