OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 15 Oct 2010 22:37:53 +0000 (15:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 15 Oct 2010 22:37:53 +0000 (15:37 -0700)
commit056b5e79452ee0a376af13659c21619c6be3eb77
tree2f86e870035bb5e3c552e1c1a5da0c2ce00f6f41
parent4cf8906e3df20776bcfab3d36d0efc7105325b4a
parentf2eea4c8af7d67ad46fa2828705a3c416f5a9893
merge from open-source master

Change-Id: Id9e817800d9073265930d282b07b5c743e9e6919