| commit | 4dd982125fbad67ee83540e4f144a3ec645ab20a | [log] [tgz] |
|---|---|---|
| author | Michael Lentine <mlentine@google.com> | Mon Dec 08 20:28:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 20:28:53 2014 +0000 |
| tree | f4f392aeedd6c87e68deb9687e04569cba7b3a1c | |
| parent | f84fb7064bde01ba5938c9e3375729fe14d2ce26 [diff] | |
| parent | 397703119bc1d5d67491b559511578820855dde2 [diff] |
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.