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)
commit2f3ec0146063b7bed40ff4f41c73407cebdc71fc
tree3710ed0b0f51afc57927faac11a7f9eb521db592
parent2d6668aaf09b01a045954c824183d53482fadafe
parent5a4d0fa291a7269007701282f32cfda55ce39008
Merge branch 'cupcake'