OSDN Git Service

Merge commit 'korg/cupcake'
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Apr 2009 01:17:59 +0000 (18:17 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Apr 2009 01:17:59 +0000 (18:17 -0700)
1  2 
core/main.mk
envsetup.sh

diff --cc core/main.mk
Simple merge
diff --cc envsetup.sh
Simple merge