OSDN Git Service

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

Trivial merge