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)
commit5ffedb22c856ae5731324b43832ab3f5309683f2
treec4b4d5c3cd96ca9c347d2ba9fed98c4d9be5e43e
parent62ac0dc457bddf7472f7be1e9895b1aee20f35cf
parent8ab5b02b5f58d9b2f050a98b189284a3d6263d7b
merge from open-source master

Change-Id: I076e0df8656fdf58c229cc9a168cd6d8e16b6d8e
libc/Android.mk