OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 10 Jan 2009 02:04:14 +0000 (18:04 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 10 Jan 2009 02:04:14 +0000 (18:04 -0800)
commit0bc54db4f9a9aab8225f5107a712c4bbbe34f79c
treef4cb3860c6d5d74726963521f94485def8d0ada8
parent0a84e9cae698b8ea5c3389429126c25816986d81
parent3edea551c14bcee302d28b8a80df1ba63e5953e1
Merge branch 'cupcake'