OSDN Git Service

Merge commit 'korg/cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Mar 2009 22:30:36 +0000 (15:30 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 27 Mar 2009 22:30:36 +0000 (15:30 -0700)

Trivial merge