OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 21:35:29 +0000 (14:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 21:35:29 +0000 (14:35 -0700)
Change-Id: I4ea9aa2765cb634382da92ff17f5af9e2f6b4078

1  2 
core/main.mk

diff --cc core/main.mk
Simple merge