merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Mar 2010 21:15:30 +0000 (14:15 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Mar 2010 21:15:30 +0000 (14:15 -0700)
Change-Id: I076e0df8656fdf58c229cc9a168cd6d8e16b6d8e

1  2 
libc/Android.mk

diff --cc libc/Android.mk
Simple merge