OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Nov 2010 00:26:07 +0000 (16:26 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Nov 2010 00:26:07 +0000 (16:26 -0800)
commitecbfaa68025a6f46c11ce1fccc0035d3695f05f5
tree4ec9eddc1430a65958c6b4f9d5ddb430f9b614c1
parent28da852d03a3201654e3dad2a81cb1da6f4e288f
parente00a18ff06a4b0f2862e541fe61f10f3bf6b6b2d
merge from open-source master

Change-Id: I872bf2f7875d101fac14e096040967596ae8f6b1