OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:36 +0000 (14:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:36 +0000 (14:05 -0800)
commit37156b8db0bee9a0e77160a40483d0fad0409bd4
tree74af26355359ef9cc135ccb138315ad386a7e755
parent8ecc90fdf2535fc2df65534bfb4f9fbe88713830
parentf87393cb242a0de85631c3df4d8f147cdbb43e59
Merge branch 'cupcake'