Commit e329be2e authored by Michael Lentine's avatar Michael Lentine Committed by Android Git Automerger
Browse files

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

* commit '784fd39a':
  Fix for corruption when numFds or numInts is too large.
parents c5380438 784fd39a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment