am 784fd39a: resolved conflicts for merge of d6308379 to lmp-dev

Browse Source

* commit '784fd39a19f659e3b464bd9a78361c0adc1cdcab':
  Fix for corruption when numFds or numInts is too large.

...

This commit is contained in:

Michael Lentine 2014-12-04 23:06:47 +00:00 committed by Android Git Automerger

parent c538043889 784fd39a19

commit e329be2e00

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