From: Alex Deymo <deymo@google.com>
Date: Fri, 14 Oct 2016 03:24:15 +0000 (+0000)
Subject: Merge changes Ie3d82cfa,I2f808896,I587f400d
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=120a2cfada;p=android-x86%2Fbuild.git

Merge changes Ie3d82cfa,I2f808896,I587f400d
am: 3b54b69205

Change-Id: Ie2c9e112a993b0bd8acca84f88cdeaba0c798440
---

120a2cfada1c01145f266eaf847abde3c5216a69