merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 17:49:00 +0000 (10:49 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 17:49:00 +0000 (10:49 -0700)
Change-Id: I63e2bfcf87d190fb063c5b2457ebe6b0d50ddd26

1  2 
libc/Android.mk

diff --cc libc/Android.mk
Simple merge