OSDN Git Service

am da9a8535: am 216d8448: am 95f862bc: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 21:39:21 +0000 (14:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 May 2010 21:39:21 +0000 (14:39 -0700)
1  2 
core/main.mk

diff --cc core/main.mk
Simple merge