OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 28 Aug 2010 04:52:49 +0000 (21:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 28 Aug 2010 04:52:49 +0000 (21:52 -0700)
commit8d2fe36a1ddbebf4fc6a2c29c1c26c80eed0f3c4
tree06b7ea38e55903e17c372ecaeefb14d568795ecf
parent28b07237bf9ac8a9d1513d2d1009e522e4089c28
parent91821236d71ec9f46828ff85b6936227f5e4a9d2
merge from open-source master

Change-Id: I12368ceb0d512ddf57d2b90c91de0a846230fe40