OSDN Git Service

am 39770311: am e329be2e: am 784fd39a: resolved conflicts for merge of d6308379 to...
authorMichael Lentine <mlentine@google.com>
Mon, 8 Dec 2014 20:28:53 +0000 (20:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Dec 2014 20:28:53 +0000 (20:28 +0000)
commit4dd982125fbad67ee83540e4f144a3ec645ab20a
treef4f392aeedd6c87e68deb9687e04569cba7b3a1c
parentf84fb7064bde01ba5938c9e3375729fe14d2ce26
parent397703119bc1d5d67491b559511578820855dde2
am 39770311: am e329be2e: am 784fd39a: resolved conflicts for merge of d6308379 to lmp-dev

* commit '397703119bc1d5d67491b559511578820855dde2':
  Fix for corruption when numFds or numInts is too large.