tree 9057d36bddede51978dec00622a42139e6e2dad1
parent 0a61a6032ccfe5b26395da1a0a9512957797fa69
parent 1e63c2d15cba608a154bbd563f96dde334691147
author Brian Carlstrom <bdc@google.com> 1399585994 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399585994 +0000

am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"

* commit '1e63c2d15cba608a154bbd563f96dde334691147':
  Add dalvik.vm.dex2oat-flags for eng build