tree d0e0d54002d3baddc6086b033a09df78c88f3b25
parent e380c11dde6a9bffa786c0ea7a72608001c7d48e
parent 708b56edc879847f418108cf360bc990bb2a502a
author Christopher Ferris <cferris@google.com> 1425748160 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425748160 +0000

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

* commit '708b56edc879847f418108cf360bc990bb2a502a':
  Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.