From: Mathieu Chartier <mathieuc@google.com>
Date: Thu, 28 Jan 2016 03:06:38 +0000 (+0000)
Subject: Merge changes from topic \'pointer_conversion\'
X-Git-Tag: android-x86-7.1-r1~424^2~123
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1e5349f9d5511bf18161f719814e80d713ff11cf;p=android-x86%2Fart.git

Merge changes from topic \'pointer_conversion\'
am: c5a8af76c3

* commit 'c5a8af76c337b49a05fe647cf2d1a0ceb8da4f76':
  Pass template args down
  Fix pointer conversion error in SetElementPtrSize
---

1e5349f9d5511bf18161f719814e80d713ff11cf