summaryrefslogtreecommitdiff
path: root/compiler/driver/compiler_driver.cc
diff options
context:
space:
mode:
author Brian Carlstrom <bdc@google.com> 2013-11-12 13:47:07 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2013-11-12 13:47:07 -0800
commit686d6f3bf7a22bdc5e676a5e735bfaef314f4de8 (patch)
tree0d08e9e3a965e6d5ad029644259b759b35e63502 /compiler/driver/compiler_driver.cc
parentde230447c96230b1ca87d82c0876f13cb7fb5855 (diff)
parentf22ca3459d8585c4d2b6b2eaaf9b67f56b4042c7 (diff)
am f22ca345: resolved conflicts for merge of 5f20cf36 to master
* commit 'f22ca3459d8585c4d2b6b2eaaf9b67f56b4042c7': Fix CTS failures caused by ignoring malformed dex files in dex2oat
Diffstat (limited to 'compiler/driver/compiler_driver.cc')
0 files changed, 0 insertions, 0 deletions