OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Nov 2010 02:03:49 +0000 (18:03 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Nov 2010 02:03:49 +0000 (18:03 -0800)
commitd267f34e984eadcd8b6b6f54122583aeb6f8fc18
treebe28921cfcf18f273336fb7ac7aec776ebd84d09
parent7322a484e73d84c8628e9d6ee1ca9da48c5f09c5
parentc8c1b446ef2553d6a27de3687bb9ade87ceff8c9
merge from open-source master

Change-Id: I253d1d2406972755b0c3923d7b8880257130a5ad