OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 4 Oct 2010 22:22:43 +0000 (15:22 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 4 Oct 2010 22:22:43 +0000 (15:22 -0700)
commitb8dcbd56fb2a3269de651f3aad7b161793bf11c5
treecbf3efb061d7c0d3e7a63520b3476ba267ba8dee
parentae3af4c259bf50906dbb6dfe02dcf9a9067f154f
parent912cb3fa416757726f008adc8547c872492309cc
merge from open-source master

Change-Id: I0b65c8c5425024aec3817848410a88e474d87b00