OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 23 Nov 2010 09:30:18 +0000 (01:30 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 23 Nov 2010 09:30:18 +0000 (01:30 -0800)
commitbf1d672b46414c648f76f3e9cdfb35d1a28bc5f1
tree2c287d2361a56cbdf90f4a1a297ab4ace0ee5dbc
parent3c90981da11ee3988a10a98b5d144662c543cc33
parent358c58c0435cf45f1148dff0b11c9138fc307e2c
merge from open-source master

Change-Id: I944fbeab95d750bf30c224c526027534e2b7d611