OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Nov 2010 22:41:00 +0000 (14:41 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Nov 2010 22:41:00 +0000 (14:41 -0800)
commitea466ae0533d5933be4c474b379d613274087cdf
tree99cac7ad930768d0b71bdff4b5f68fd788abb568
parent564b1c2cb97ae4ce26e9fcebb3586fa4e484761d
parent1b89d10d766a511ee5630e66a3064f0cadd162fd
merge from open-source master

Change-Id: I4d2189f435ea2ef7e66f4c78d703329eed1940bf