OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Nov 2010 23:24:38 +0000 (15:24 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Nov 2010 23:24:38 +0000 (15:24 -0800)
commitae51f668c51f9c0830e88f204232cb41d7920fc1
treed9c2c8e3a296b35f05ca8735746d7d4974ac1d10
parent193997186b8429499cca076b19dafb79742687f9
parentc63bf1f5fba1e80bb208c9369c24e785d9acc6b5
merge from open-source master

Change-Id: I8f32a2192c0fe5b95b45c2cc12751454c533dfbc