am af8d8f2c: resolved conflicts for merge of 27d276f3 to lmp-mr1-dev-plus-aosp

Browse Source

* commit 'af8d8f2c88bcf78cb3c94d241cf412d65f5ed55e':
  Avoid pathological behavior in OpenBSD's fread.

...

This commit is contained in:

Elliott Hughes

2014-12-03 20:44:17 +00:00

committed by Android Git Automerger

parent b858ba5846 af8d8f2c88

commit d8e3a199a1

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

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

Diff Content Not Available