From: Josh Gao <jmgao@google.com>
Date: Fri, 22 Jul 2016 19:28:38 +0000 (+0000)
Subject: Merge changes I7718b1ba,I648adc35
X-Git-Tag: android-x86-8.1-r1~224^2^2~85^2~214
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ba03502f56;p=android-x86%2Fbionic.git

Merge changes I7718b1ba,I648adc35
am: 4f62c5b311

Change-Id: Ia117c90c75866c0672cbdc0f0fa34975e58b2b0f
---

ba03502f56c78ece6d37b4a86793808c2fca4afe