OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 22 Jan 2009 08:16:03 +0000 (00:16 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 22 Jan 2009 08:16:03 +0000 (00:16 -0800)
commit00743dcf9e86961f3867b81ef81022040c821f18
treea1b1c87e11ac55bcc850b72961f9e3cae18a01a4
parent7e9a5b296c8dc08e33d01413f2bb30294a15306f
parent21208dbbe2608ae45b8c4a50d83e353880dc491f
Merge branch 'cupcake'