From: Vladimir Marko <vmarko@google.com>
Date: Wed, 15 Jul 2015 17:36:10 +0000 (+0000)
Subject: am 8282e05e: am 12cfc600: Merge "Clean up after verifier changes wrt. conflict/undefi... 
X-Git-Tag: android-x86-7.1-r1~1961
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=add14290;p=android-x86%2Fart.git

am 8282e05e: am 12cfc600: Merge "Clean up after verifier changes wrt. conflict/undefined reg."

* commit '8282e05e45e828df3f2d760a7cfbc3c352f5f5da':
  Clean up after verifier changes wrt. conflict/undefined reg.
---

add14290b5b90c24107d45079f74ff79b85cf5a0