OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:23 +0000 (14:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:23 +0000 (14:05 -0800)
commitf12832e7415222fb688414c9d7d593fb60b180fd
tree4b825dc642cb6eb9a060e54bf8d69288fbee4904
parentc355afcdbeb4619e5e324647eb5cebc79b3efbf6
parentba4d87d3b1f3d5de6bdd9da5d8e65a17d7d06167
Merge branch 'cupcake'