From: Scott Main <smain@google.com>
Date: Wed, 3 Oct 2012 04:07:42 +0000 (-0700)
Subject: am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick... 
X-Git-Tag: android-x86-4.4-r1~457^2~1^2~28
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e41404f4;p=android-x86%2Fbuild.git

am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800

* commit '83fca03d080b88d5ecda75f6c5b5a1f44fa25d8f':
  DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800
---

e41404f496002a24f670f6c16f3fbae07b10ce3e