From: Elliott Hughes <enh@google.com>
Date: Thu, 24 Apr 2014 16:27:28 +0000 (+0000)
Subject: am 7cad688e: am 847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."
X-Git-Tag: android-x86-6.0-r1~1204^2~202
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bb21bfb0;p=android-x86%2Fbuild.git

am 7cad688e: am 847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."

* commit '7cad688ea267df86ceb9c7fbfd6bc463af4580b1':
  Leave 'linux' defined on x86/x86-64, like arm.
---

bb21bfb090c29be17473b318a0d54ec5bcc5243c