From: The Android Open Source Project <initial-contribution@android.com>
Date: Wed, 31 Mar 2010 21:15:30 +0000 (-0700)
Subject: merge from open-source master
X-Git-Url: https://git.ti.com/gitweb?p=android-sdk%2Fplatform-bionic.git;a=commitdiff_plain;h=5ffedb22c856ae5731324b43832ab3f5309683f2

merge from open-source master

Change-Id: I076e0df8656fdf58c229cc9a168cd6d8e16b6d8e
---

5ffedb22c856ae5731324b43832ab3f5309683f2