OSDN Git Service

resolved conflicts for merge of d2e5a693 to lmp-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Tue, 16 Sep 2014 18:44:28 +0000 (11:44 -0700)
committerAndreas Gampe <agampe@google.com>
Tue, 16 Sep 2014 18:44:28 +0000 (11:44 -0700)
commit5550099d34f97ad49cc10ccee7747d6951607e78
treeabe5a964dd149a09fca5719461c5969446740ed4
parentc18dec135436db84c5d5a7743f771f2aecf8c36e
parentd2e5a6934ca1a07c9e1e87d3d0b21b63e1011934
resolved conflicts for merge of d2e5a693 to lmp-dev-plus-aosp

Change-Id: If834354fbf8b022487bf6d50fc08125a20726012
runtime/verifier/method_verifier.cc
runtime/verifier/method_verifier.h