From: Andreas Gampe <agampe@google.com>
Date: Thu, 9 Jul 2015 03:34:23 +0000 (+0000)
Subject: am c2bf1255: ART: Allow to set and copy conflicts in the verifier
X-Git-Tag: android-x86-7.1-r1~2019
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=32e8f524c4a4ebf7ae725f251b0bc5802c73a3e0;p=android-x86%2Fart.git

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

* commit 'c2bf1255ebf360d009dd0763dcea8d2c9b9c676e':
  ART: Allow to set and copy conflicts in the verifier
---

32e8f524c4a4ebf7ae725f251b0bc5802c73a3e0