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

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

* commit '05e89b22a0bc1bbed1579c1bc6139b45ef41aa88':
  Amend 64 bit blacklist.
---

0fe8eac25f44159c3d3ebd280dc82abf073eb8ec