OSDN Git Service

resolved conflicts for merge of e0f7df2c to lmp-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Sat, 13 Sep 2014 00:34:47 +0000 (17:34 -0700)
committerAndreas Gampe <agampe@google.com>
Sat, 13 Sep 2014 01:22:44 +0000 (18:22 -0700)
commitda151bb3afeb9d1322e9b99a7e06be8b966fa140
tree3fa593b79b582796a0cdd024513d9a48a8cdf4e6
parent39faf87edf157be27d75e999e47daab182a76869
parente0f7df2c4d2d559b8ab4e705153cd32cdbdd98dc
resolved conflicts for merge of e0f7df2c to lmp-dev-plus-aosp

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