From: The Android Open Source Project <initial-contribution@android.com>
Date: Wed, 21 Mar 2012 15:22:52 +0000 (-0700)
Subject: Reconcile with ics-mr1-release
X-Git-Tag: android-x86-4.4-r1~939^2~24^2~40
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7000342d;p=android-x86%2Fbuild.git

Reconcile with ics-mr1-release

Change-Id: Ib4394bc59cd66c0d8071c5dcb0d20543241b36c8
---

7000342da9241170fa831a8ec887ecc6f4aa426d