am f94b491c: (-s ours) am 4d7d05bd: Merge "Revert "fix incompatibility with -fstack-protector-strong""

Browse Source

* commit 'f94b491c2b9f8f01038af73863b6ba3945f70d0b':

...

This commit is contained in:

Nick Kralevich 2015-08-27 05:06:13 +00:00 committed by Android Git Automerger

parent 40773fb797 f94b491c2b

commit 437c3e48f9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available