OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Sep 2010 01:16:10 +0000 (18:16 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Sep 2010 01:16:10 +0000 (18:16 -0700)
commit7cf47013f19e4181a6cb3438a4a46a3a1be9594e
tree9cd12202d373f7289b11bdc238ab3e197d89123b
parent599cf4951495ff71b56965e70900438d563df8ed
parentc6613461499d0a812ce1bcf7dd72df6f02010417
merge from open-source master

Change-Id: I3a1a6421773f9c95192f31ea5b55275004d2c1ee