From: The Android Automerger <android-build@android.com>
Date: Mon, 14 Nov 2011 14:45:11 +0000 (-0800)
Subject: merge in ics-mr1-release history after reset to ics-mr1
X-Git-Tag: android-x86-4.4-r1~1445^3~3^2~2^2~2^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0603c3a67c11bf5219e60204710518f2d2277346;p=android-x86%2Fbuild.git

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

0603c3a67c11bf5219e60204710518f2d2277346