OSDN Git Service

resolved conflicts for merge of df4a39e8 to lmp-dev-plus-aosp
authorMathieu Chartier <mathieuc@google.com>
Sat, 13 Sep 2014 02:46:28 +0000 (19:46 -0700)
committerMathieu Chartier <mathieuc@google.com>
Sat, 13 Sep 2014 02:58:41 +0000 (19:58 -0700)
commit2ed28704733fae65d304fe54e483202d871a22cf
treedb2d941e47629e52a1c3369832b893e9d08d1b2d
parentda151bb3afeb9d1322e9b99a7e06be8b966fa140
parentdf4a39e8ca60e6226f6b5db9f34447847e499408
resolved conflicts for merge of df4a39e8 to lmp-dev-plus-aosp

Change-Id: I6dc353b7e3e5a120ddf957accf235ce8f98bca25
runtime/runtime.cc
runtime/verifier/method_verifier.cc
runtime/verifier/method_verifier.h
runtime/verifier/reg_type_cache.cc
runtime/verifier/reg_type_cache.h