tree ef395b3c6fa6c8c285335c4f6abace64fa5a1f3e
parent cd882627448dd0a9a084efd28017d745b946d7cd
parent 676c8f0450a9dfb84c12257195ba05619aeed970
author Brian Carlstrom <bdc@google.com> 1399586437 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399586437 +0000

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

* commit '676c8f0450a9dfb84c12257195ba05619aeed970':
  Add dalvik.vm.dex2oat-flags for eng build