OSDN Git Service

am c2bf1255: ART: Allow to set and copy conflicts in the verifier
authorAndreas Gampe <agampe@google.com>
Thu, 9 Jul 2015 03:34:23 +0000 (03:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jul 2015 03:34:23 +0000 (03:34 +0000)
commit32e8f524c4a4ebf7ae725f251b0bc5802c73a3e0
tree0f5f4740c2f986628039d761a9ae1077bc9ae932
parent14b87526211693a39f3adf2b3d47a31058791523
parentc2bf1255ebf360d009dd0763dcea8d2c9b9c676e
am c2bf1255: ART: Allow to set and copy conflicts in the verifier

* commit 'c2bf1255ebf360d009dd0763dcea8d2c9b9c676e':
  ART: Allow to set and copy conflicts in the verifier
test/800-smali/expected.txt
test/800-smali/src/Main.java