OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 28 Jun 2010 17:35:50 +0000 (10:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 28 Jun 2010 17:35:50 +0000 (10:35 -0700)
commitdcd11407e242e8e50d122752a5df769450ab6d8d
treed6cc98660c0aa74a05f00c2a84a3566407ff5f40
parentfe75781ee9b51bc1266f5e9d002637c53cd3c92c
parent833e62400e7ecfea3df188b99b6639708fe36963
merge from open-source master

Change-Id: I90d465b0197034dab76505b8a68afc519be3e6e0