OSDN Git Service

resolved conflicts for merge of e9bc7372 to lmp-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Fri, 12 Sep 2014 22:50:37 +0000 (15:50 -0700)
committerAndreas Gampe <agampe@google.com>
Fri, 12 Sep 2014 23:14:42 +0000 (16:14 -0700)
commita19dcc1eb21af0c03b0c73a0eef5f6d80dd24b65
treea865b19a7af16a6b08aacfc157e8af6226d06448
parent5a203cfb6eacbd1906209596ca0895dce41894f3
parente9bc73723b8a9456933b04104595fa1bd3a3456b
resolved conflicts for merge of e9bc7372 to lmp-dev-plus-aosp

Change-Id: I952793dc6c7d17b31a011b4525e76c7b64299491
compiler/driver/compiler_driver.cc
compiler/oat_writer.cc
oatdump/oatdump.cc
runtime/class_linker.cc
runtime/dex_file.h
runtime/verifier/method_verifier.cc