From: Vladimir Marko <vmarko@google.com>
Date: Mon, 7 Mar 2016 18:38:59 +0000 (+0000)
Subject: Merge "ART: Fix RegTypeCache::FromUnresolvedMerge()."
X-Git-Tag: android-x86-7.1-r1~340^2~24^2~39
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=39c5d595cd;p=android-x86%2Fart.git

Merge "ART: Fix RegTypeCache::FromUnresolvedMerge()."
am: 810ef37680

* commit '810ef3768021b5fc7b47e663e037e49c46f8c916':
  ART: Fix RegTypeCache::FromUnresolvedMerge().
---

39c5d595cd50441e666e5ab0a4af86bdcb46c616