From: Ian Rogers <irogers@google.com>
Date: Wed, 29 Oct 2014 12:31:18 +0000 (+0000)
Subject: am ac293277: Merge "Add gp initialization to the art_quick_imt_conflict_trampoline... 
X-Git-Tag: android-x86-7.1-r1~1755^2~2220
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d06eefb992dad1a5330b1a6b6ed5be72b9b0e5bf;p=android-x86%2Fart.git

am ac293277: Merge "Add gp initialization to the art_quick_imt_conflict_trampoline() function."

* commit 'ac293277b69882105810fabd6c53f55de58823fe':
  Add gp initialization to the art_quick_imt_conflict_trampoline() function.
---

d06eefb992dad1a5330b1a6b6ed5be72b9b0e5bf