am abd1975d: (-s ours) am 5f7a5125: Merge "fix incompatibility with -fstack-protector-strong"

* commit 'abd1975dcc814087afb1fe262b5f2ce389fb4ff9':
This commit is contained in:
Nick Kralevich 2015-08-27 05:06:12 +00:00 committed by Android Git Automerger
commit 40773fb797

Diff Content Not Available