OSDN Git Service

resolve merge conflicts of 9f784b26a1 to master.
authorAlex Light <allight@google.com>
Thu, 17 Dec 2015 23:48:01 +0000 (15:48 -0800)
committerAlex Light <allight@google.com>
Thu, 17 Dec 2015 23:48:01 +0000 (15:48 -0800)
commit9c5572957bf357897f0969d002132fc647bfa649
tree84e853d076d2a7449e0eba1710b2a4b3d0872fda
parent90f5250d4ba7bcf6066edb022f8325df66d686f3
parent9f784b26a13101222c5e5927cafd7f500d3cff67
resolve merge conflicts of 9f784b26a1 to master.

Change-Id: I9ebcb6e3d51be922e08e5f867fb8dcaf5cb9788d
compiler/driver/compiler_driver_test.cc
compiler/oat_test.cc
runtime/asm_support.h
runtime/class_linker.cc
runtime/class_linker_test.cc
runtime/mirror/class.h