OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 10 Jan 2009 02:04:22 +0000 (18:04 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 10 Jan 2009 02:04:22 +0000 (18:04 -0800)
commitb8d641626369e6b98fdc9a71ec0052dc2b287b84
tree91425ac62445a57521b96cc2b2cf6cb556d4d40a
parentedda217c80a20a79a286839c7c8b9c4fb670b978
parentef92a2e0e9749c7439f660a32d474d17f47fa43b
Merge branch 'cupcake'