From: The Android Automerger <android-build@android.com>
Date: Sat, 21 Jan 2012 00:11:41 +0000 (-0800)
Subject: merge in ics-mr1-release history after reset to ics-mr1
X-Git-Tag: android-x86-4.0-r1~26
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=42474c1e646c3171d33fa9dd13acebda509eb4e2;p=android-x86%2Fdalvik.git

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

42474c1e646c3171d33fa9dd13acebda509eb4e2