OSDN Git Service

Merge commit 'remotes/korg/cupcake'
authorJean-Baptiste Queru <jbq@google.com>
Fri, 19 Dec 2008 15:54:59 +0000 (07:54 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 19 Dec 2008 15:54:59 +0000 (07:54 -0800)
commitbfa3b5a44583da9d31f1a20cbb15e1bb5aa0d827
treebec27a22da97ed347195e4f13d5b1ce317ce8b6c
parent0cb2938e14a71a93fbc95c3b741b613ab9dd2c63
parent2ebd1d2ce82c4f10284c70a28ea62535349a7334
Merge commit 'remotes/korg/cupcake'
config/en.us/Android.mk