From: Adam Seaton <aseaton@google.com>
Date: Tue, 23 May 2017 17:32:15 +0000 (+0000)
Subject: Merge changes Id4d040ea,I318fb1fc into mnc-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f5c749c512;p=android-x86%2Fbuild.git

Merge changes Id4d040ea,I318fb1fc into mnc-dev
am: a2603bd360

Change-Id: Ia22d1824913e82550dae44a799cb9da4c7344949
---

f5c749c512a1960e1c3271b61423137f57f16aae