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)
commit060f233a246353b8412bc0c0290f9463dc2967d5
tree80da1a21f5299e4ae3f638f9c11456a36c810aed
parentceb6a4b462e25fbe74e847241ad9431acc4951d9
parent4da15c90a4f3e67182afce7b41d67f9ffbf511f0
Merge branch 'cupcake'