OSDN Git Service

Merge branch 'cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:41 +0000 (14:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Jan 2009 22:05:41 +0000 (14:05 -0800)
commit4e0ea752b4264b428e565251f41ff9fac6fa2384
treeb1940c5f033ed81b538db1762b8467667a0a0136
parentaab45d54d10a54c93a0d625e4c2839b55b5168fa
parent01f172366c86623cc45a1b9a810dda86c595eb19
Merge branch 'cupcake'