From: Dan Willemsen <dwillemsen@google.com>
Date: Thu, 16 Jun 2016 15:50:46 +0000 (+0000)
Subject: Merge changes Ib6ffcc38,Ia58e6bc1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5da565a85a;p=android-x86%2Fbuild.git

Merge changes Ib6ffcc38,Ia58e6bc1
am: 3068a85962

Change-Id: I20aec66ac749a5db3f65e368e14a5caca12afff8
---

5da565a85ae3de7f1bede59f371bf36032c5aedd