From: Elliott Hughes <enh@google.com>
Date: Sat, 5 Dec 2015 00:06:11 +0000 (-0800)
Subject: Merge "Fix GCC build." am: ef2ba3dbf9
X-Git-Tag: android-x86-7.1-r1~159^2~119
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=703a31ad1f;p=android-x86%2Fbionic.git

Merge "Fix GCC build." am: ef2ba3dbf9
am: 70d477c913

* commit '70d477c913981047235054b6bbb4faa5bfcafb8f':
  Fix GCC build.
---

703a31ad1fed536bfcf0ce1eb3dfcb2bbcfb42b6