OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Mar 2010 01:16:23 +0000 (17:16 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Mar 2010 01:16:23 +0000 (17:16 -0800)
Change-Id: I9fedeb014c946b53bfdd424b00c0cb5fc08f8333

1  2 
core/Makefile

diff --cc core/Makefile
Simple merge