From: Nicolas Geoffray <ngeoffray@google.com>
Date: Fri, 12 Feb 2016 13:30:34 +0000 (+0000)
Subject: Merge "Re-enable OSR."
X-Git-Tag: android-x86-7.1-r1~408^2~49
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c1eb1bb6c871c083f36798b446ee5ae1d45ea659;p=android-x86%2Fart.git

Merge "Re-enable OSR."
am: 5960a3f430

* commit '5960a3f430d1e7f47ea3db9a8364dc82e3f8add9':
  Re-enable OSR.
---

c1eb1bb6c871c083f36798b446ee5ae1d45ea659