From: Andreas Gampe <agampe@google.com>
Date: Tue, 20 Oct 2015 23:59:45 +0000 (+0000)
Subject: Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting" am: 6c45f4493e am: 3c131856ee
X-Git-Tag: android-x86-7.1-r1~834
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=36047501aa4890af62d4187e9e88a94d0bb6488b;p=android-x86%2Fbuild.git

Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting" am: 6c45f4493e am: 3c131856ee
am: 92a73a0f6c

* commit '92a73a0f6c0c768d4bc612106e0c6ddcb7fb2846':
  Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
---

36047501aa4890af62d4187e9e88a94d0bb6488b