tree 064bb12865340bdbec8bad50bf096b79abab352d
parent 6faf9925b3c1f833681443195e43c07e11570b52
parent 46ba5456ad33e0674929eefff0753e21301e6eba
author Christopher Ferris <cferris@google.com> 1425773279 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425773279 +0000

am 46ba5456: am 708b56ed: Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."

* commit '46ba5456ad33e0674929eefff0753e21301e6eba':
  Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.