OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 22:52:40 +0000 (15:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 22:52:50 +0000 (15:52 -0700)
commitbc12cd04b878a9c3520abd21600c2078c930adc3
treef3a453e407b18a01a703d25ddb75587fe802d6d0
parent95f862bcb0418fd931c574157a5c90312ea2fb77
parent4dccdd640123fa60daad1b575b01012521585428
merge from open-source master

Change-Id: I0dd123dde8f0da42a99313cffed6a48d30e38381