From: Josh Gao <jmgao@google.com>
Date: Fri, 11 Nov 2016 22:30:57 +0000 (+0000)
Subject: Merge changes I7f32dc9f,I9d88ddb1
X-Git-Tag: android-x86-8.1-r1~224^2^2~176
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e250aff83f;p=android-x86%2Fbionic.git

Merge changes I7f32dc9f,I9d88ddb1
am: cd9ce19e9c

Change-Id: I3294cceacf564de140e374068c5ed3974df1875c
---

e250aff83f787459d570b7c6b4e37e65ede40d3d