From: Adam Seaton <aseaton@google.com>
Date: Wed, 21 Sep 2016 17:57:17 +0000 (+0000)
Subject: Merge changes I1489eaf6,I8ee8f978 into nyc-dev am: 575add3bcf
X-Git-Tag: android-x86-7.1-r1~100^2~7
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a871b53ff32038658ca12601ea5a86717cff062e;p=android-x86%2Fbuild.git

Merge changes I1489eaf6,I8ee8f978 into nyc-dev am: 575add3bcf
am: 7706e91d8f

Change-Id: I046a6fd53782e965e39a5a43ab0ea151794a1aeb
---

a871b53ff32038658ca12601ea5a86717cff062e