OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:37 +0000 (14:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:37 +0000 (14:05 -0800)
commit7b0cad1a2a14503ed82f4e5691e2f2efd4d34733
tree80e5c97cda2871e70d1614fdb362a7ddc925909d
parentfe62d17df75b00178ffe6782e9d7cc9074cc5b33
parenta9e9593ea70317d38daadb473dd98ae62033d88a
Merge branch 'cupcake'