From: Narayan Kamath <narayan@google.com>
Date: Mon, 3 Mar 2014 12:32:11 +0000 (+0000)
Subject: am 3246d88d: resolved conflicts for merge of e8bb5c3a to klp-modular-dev-plus-aosp
X-Git-Tag: android-x86-6.0-r1~1939^2~39
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=05e89b22a0bc1bbed1579c1bc6139b45ef41aa88;p=android-x86%2Fbuild.git

am 3246d88d: resolved conflicts for merge of e8bb5c3a to klp-modular-dev-plus-aosp

* commit '3246d88d6c71cceec967241337f9da33e1b12d02':
  Amend 64 bit blacklist.
---

05e89b22a0bc1bbed1579c1bc6139b45ef41aa88