OSDN Git Service

am e329be2e: am 784fd39a: resolved conflicts for merge of d6308379 to lmp-dev
authorMichael Lentine <mlentine@google.com>
Mon, 8 Dec 2014 19:10:21 +0000 (19:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Dec 2014 19:10:21 +0000 (19:10 +0000)
commit397703119bc1d5d67491b559511578820855dde2
tree5d35241044ab71f01c3b6a7204db3f21014cb07e
parent59b5783df7a80f354f8a996c9a1532a5ab384436
parente329be2e0004216474fe0545ab7a2cb1863d387a
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.