From: Nicolas Geoffray <ngeoffray@google.com>
Date: Tue, 15 Dec 2015 16:18:26 +0000 (-0800)
Subject: Merge "Fix --inline-max-code-units option." am: bf14c65108
X-Git-Tag: android-x86-7.1-r1~846^2~126
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=23bd1e913c16642c59c878e9008639ff10abb6c8;p=android-x86%2Fart.git

Merge "Fix --inline-max-code-units option." am: bf14c65108
am: 57222d44bc

* commit '57222d44bc4b02e258eb3958b5ad18ff36b28978':
  Fix --inline-max-code-units option.
---

23bd1e913c16642c59c878e9008639ff10abb6c8