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

* commit 'e329be2e0004216474fe0545ab7a2cb1863d387a':
  Fix for corruption when numFds or numInts is too large.
This commit is contained in:
Michael Lentine 2014-12-08 19:10:21 +00:00 committed by Android Git Automerger
commit 397703119b

Diff Content Not Available