OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:37 +0000 (14:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:37 +0000 (14:05 -0800)
commit5af6317f266c0f7792f6a2fa1c2061f61529aab7
tree9450698fa8fc0311a0ee1335e2b050e6171ccb22
parent5ce01674d44addab570009ceddeaa08d64534092
parent987df5db6d269300aa1b89af506cf18cf380be51
Merge branch 'cupcake'