From: Brian Carlstrom <bdc@google.com>
Date: Tue, 1 Apr 2014 19:30:43 +0000 (+0000)
Subject: am 4888fe34: resolved conflicts for merge of cece45d2 to klp-modular-dev-plus-aosp
X-Git-Tag: android-x86-6.0-r1~1917
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4d864206eac1d5468973bfbce681a0208b73ec0d;p=android-x86%2Fbuild.git

am 4888fe34: resolved conflicts for merge of cece45d2 to klp-modular-dev-plus-aosp

* commit '4888fe345306cd747b03757a01089683a2e6c922':
  cortex-a7 supports div
---

4d864206eac1d5468973bfbce681a0208b73ec0d