OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 10 Jan 2009 02:04:23 +0000 (18:04 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 10 Jan 2009 02:04:23 +0000 (18:04 -0800)
commit3ac99e23129828e539ad1f4369eae56940aa9b1c
tree283fec12026e2ed39618fa0668792759332d3779
parenteef1589d1f658de1b50a5617c4f5edae0daa0769
parentf0d90e9e5a360a627f8ca5652fb6052e0d1c123a
Merge branch 'cupcake'