am c2bf1255: ART: Allow to set and copy conflicts in the verifier

author Andreas Gampe <agampe@google.com>

Thu, 9 Jul 2015 03:34:23 +0000 (03:34 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Thu, 9 Jul 2015 03:34:23 +0000 (03:34 +0000)
author Andreas Gampe <agampe@google.com>
Thu, 9 Jul 2015 03:34:23 +0000 (03:34 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 9 Jul 2015 03:34:23 +0000 (03:34 +0000)
diff --cc test/800-smali/expected.txt
Simple merge
diff --cc test/800-smali/src/Main.java
Simple merge
author	Andreas Gampe <agampe@google.com>
	Thu, 9 Jul 2015 03:34:23 +0000 (03:34 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 9 Jul 2015 03:34:23 +0000 (03:34 +0000)
		1	2
test/800-smali/expected.txt	patch \|	diff1 \|	diff2 \|	blob \| history
test/800-smali/src/Main.java	patch \|	diff1 \|	diff2 \|	blob \| history