OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:31 +0000 (14:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:31 +0000 (14:05 -0800)
commit7e9a5b296c8dc08e33d01413f2bb30294a15306f
tree486d3145e246b9c8b83e3acb7543ca6e22b84f60
parent3a1236185ad5b2838063c50fbf8c510103362daf
parent14c27f8650c090a4bab4ab4156f335c762ab228a
Merge branch 'cupcake'