OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:41 +0000 (14:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:41 +0000 (14:05 -0800)
commita804677446901a6441eafb2fcac602c4d06bbd83
tree3facbac0cd60a27349f342dbf49fbd0bb30da6a3
parented3407722ac086d356f8efce20a8855e2a5ba66d
parentb3f1e54c6c3dd6b61df23fcbda8915eb51027769
Merge branch 'cupcake'