From: Scott Main <smain@google.com>
Date: Wed, 3 Oct 2012 04:09:29 +0000 (-0700)
Subject: am a168a83a: am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE... 
X-Git-Tag: android-x86-4.4-r1~456^2^2~95
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6190ac593ab0188acc274ef40504bd71c2a76e27;p=android-x86%2Fbuild.git

am a168a83a: am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73

* commit 'a168a83a8940eea54ee66bb7610a63ce49c67874':
  DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73
---

6190ac593ab0188acc274ef40504bd71c2a76e27