From: The Android Automerger <android-build@android.com>
Date: Fri, 30 Sep 2011 13:44:15 +0000 (-0700)
Subject: merge in ics-release history after reset to master
X-Git-Tag: android-x86-4.4-r1~965^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bf8f6bb8202beb1c3e1d9cc861e8b0e3879372d3;p=android-x86%2Fbionic.git

merge in ics-release history after reset to master
---

bf8f6bb8202beb1c3e1d9cc861e8b0e3879372d3