From: Adam Seaton Date: Wed, 14 Dec 2016 00:34:23 +0000 (+0000) Subject: Merge changes I761c90cd,I0e2dd0af into nyc-dev am: cb4af5774a am: a74871cfd3 X-Git-Tag: android-x86-7.1-r1~45^2~2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2d08201d3b;p=android-x86%2Fbuild.git Merge changes I761c90cd,I0e2dd0af into nyc-dev am: cb4af5774a am: a74871cfd3 am: 32e254e258 Change-Id: I7b9e67e87349a4646ab25a413e018dc98b53f3f2 --- 2d08201d3b5e8f7e1c8795a7d5dd86a78f315df5