OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 10 Jan 2009 02:04:22 +0000 (18:04 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 10 Jan 2009 02:04:22 +0000 (18:04 -0800)
commit19b5d4e6e5af479c2c70b37f0cba40d19457b854
treeb54f58066e50b05505b521b62be69f25f49541e2
parent4158b09dc232f5e1d882aa037aed8159c11d531d
parent699d24ab112439658bfe6a09fb0bf53b8bf5fad3
Merge branch 'cupcake'