OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:23 +0000 (14:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:23 +0000 (14:05 -0800)
commit2d6668aaf09b01a045954c824183d53482fadafe
treee045a54a6979ee399dd7931576d6a0b13d9b9c98
parentdb1b7a2e17ba200c36b7ab73920a76b28a43974c
parent7b53e3937797ee1eea71c6291bdcd58cb9dedf7a
Merge branch 'cupcake'