From: Nicolas Geoffray <ngeoffray@google.com>
Date: Thu, 24 Dec 2015 02:15:11 +0000 (-0800)
Subject: Merge "Rename options for shorter names." am: bc58b020c8 am: b4bfd7f529
X-Git-Tag: android-x86-7.1-r1~846^2~46
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d738280e6aa015a7b179203fa4923f11c9571694;p=android-x86%2Fart.git

Merge "Rename options for shorter names." am: bc58b020c8 am: b4bfd7f529
am: 1db8c382e9

* commit '1db8c382e9ef69cbd80b7f538fb667fbc1d9d648':
---

d738280e6aa015a7b179203fa4923f11c9571694