| commit | e329be2e0004216474fe0545ab7a2cb1863d387a | [log] [tgz] |
|---|---|---|
| author | Michael Lentine <mlentine@google.com> | Thu Dec 04 23:06:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 04 23:06:47 2014 +0000 |
| tree | c9835bb93769e21b3d47c3592eeb22bb06bfedf5 | |
| parent | c538043889b773eeeae0bf0ac54b06cd68360734 [diff] | |
| parent | 784fd39a19f659e3b464bd9a78361c0adc1cdcab [diff] |
am 784fd39a: resolved conflicts for merge of d6308379 to lmp-dev * commit '784fd39a19f659e3b464bd9a78361c0adc1cdcab': Fix for corruption when numFds or numInts is too large.