From: Nick Kralevich <nnk@google.com>
Date: Mon, 24 Aug 2015 04:30:22 +0000 (+0000)
Subject: am 5f7a5125: Merge "fix incompatibility with -fstack-protector-strong"
X-Git-Tag: android-x86-7.1-r1~270^2~241
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=51d25793676b6716ed9d29cd966b73f55c984c0e;p=android-x86%2Fbionic.git

am 5f7a5125: Merge "fix incompatibility with -fstack-protector-strong"

* commit '5f7a5125a53951543e27276877fa6b71eb08a5d8':
  fix incompatibility with -fstack-protector-strong
---

51d25793676b6716ed9d29cd966b73f55c984c0e