OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:21 +0000 (14:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:21 +0000 (14:05 -0800)
commitc2f23bb1cdea20fc5e8e5b8101d9d0bd6d14b74b
treef005d945ce90569b8e63cf42294ab42dddab52c2
parent8af5c80fb8cb58430ae407127a25fb841d3b7d52
parentd37527501c85edcb3a6a7c8a0b6297d52d434897
Merge branch 'cupcake'