summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lentine <mlentine@google.com>2014-12-04 23:06:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-04 23:06:47 +0000
commite329be2e0004216474fe0545ab7a2cb1863d387a (patch)
treec9835bb93769e21b3d47c3592eeb22bb06bfedf5
parentc538043889b773eeeae0bf0ac54b06cd68360734 (diff)
parent784fd39a19f659e3b464bd9a78361c0adc1cdcab (diff)
downloadnative-e329be2e0004216474fe0545ab7a2cb1863d387a.tar.gz
am 784fd39a: resolved conflicts for merge of d6308379 to lmp-dev
* commit '784fd39a19f659e3b464bd9a78361c0adc1cdcab': Fix for corruption when numFds or numInts is too large.
0 files changed, 0 insertions, 0 deletions