From: Nicolas Geoffray <ngeoffray@google.com>
Date: Thu, 18 Feb 2016 16:56:42 +0000 (+0000)
Subject: Merge "Fix build aflter conflicting changes got in."
X-Git-Tag: android-x86-7.1-r1~395^2~2^2~31^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=07f7affb338b529d34e4e18b7e8a631c16bd9765;p=android-x86%2Fart.git

Merge "Fix build aflter conflicting changes got in."
---

07f7affb338b529d34e4e18b7e8a631c16bd9765