From: Christopher Ferris <cferris@google.com>
Date: Thu, 21 Jul 2016 02:14:06 +0000 (+0000)
Subject: resolve merge conflicts of 823e32e to stage-aosp-master am: 1750ab4e21
X-Git-Tag: android-x86-8.1-r1~296^2~361
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5bbe259b28;p=android-x86%2Fbionic.git

resolve merge conflicts of 823e32e to stage-aosp-master am: 1750ab4e21
am: cf02165ee3

Change-Id: I3c9ff3f8992d3a8d36e6c45e3526107796b95cec
---

5bbe259b28883af916936555de955a8a741a6708