From: Sebastien Hertz <shertz@google.com>
Date: Thu, 9 Jul 2015 12:56:27 +0000 (+0200)
Subject: resolved conflicts for merge of 5ee9454d to mnc-dev-plus-aosp
X-Git-Tag: android-x86-7.1-r1~2015
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=30bec90cc47aa16c23161d65d062e1fa87157b76;p=android-x86%2Fart.git

resolved conflicts for merge of 5ee9454d to mnc-dev-plus-aosp

Change-Id: I631e6ebdbc5e7abc571de133b337309ed08282e3
---

30bec90cc47aa16c23161d65d062e1fa87157b76