OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 30 Sep 2010 15:29:26 +0000 (08:29 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 30 Sep 2010 15:29:26 +0000 (08:29 -0700)
commitc80e410b97dc57d8c4cdf9c4dc564b1afb6a427d
treeee1fd1bceae1f00daa4d203ee160ce2a47fa2da0
parent208883fa5b5870f36919689db63af6285cd723c8
parenta629091f64956b2367e7041e72011b6a545a4b3a
merge from open-source master

Change-Id: Ief0d8b20aeddb245f9ebaa4989d06d6eb86d12fd