From: Andreas Gampe <agampe@google.com>
Date: Wed, 1 Jul 2015 05:42:04 +0000 (+0000)
Subject: am bd9f8176: am 2b252dc1: Merge "Quick: Fix a DCHECK to take type conflicts into... 
X-Git-Tag: android-x86-7.1-r1~2083
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=aad776b3bd6c6b9543ce61bd564666053ab2b21f;p=android-x86%2Fart.git

am bd9f8176: am 2b252dc1: Merge "Quick: Fix a DCHECK to take type conflicts into account."

* commit 'bd9f81765ba3e30b1037ad27d7ea47f9dbd7a1fc':
  Quick: Fix a DCHECK to take type conflicts into account.
---

aad776b3bd6c6b9543ce61bd564666053ab2b21f