OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 22 Mar 2010 22:55:11 +0000 (15:55 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 22 Mar 2010 22:55:11 +0000 (15:55 -0700)
commitd05de7642c0365767178c19ef8c595a3d2842b64
tree8e282e08bfd4ad1136eae6d224d399d52f04f9e5
parent7a0ac131d02b566bc9f15486d70112d263f2c2b9
parentfb0b04d485bcf5c565c6e8125a00bf46ee791b4d
merge from open-source master

Change-Id: Ia641d105e05982e3a3c85c7b82a70fe1fa664f1a