| commit | 397703119bc1d5d67491b559511578820855dde2 | [log] [tgz] |
|---|---|---|
| author | Michael Lentine <mlentine@google.com> | Mon Dec 08 19:10:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 19:10:21 2014 +0000 |
| tree | 5d35241044ab71f01c3b6a7204db3f21014cb07e | |
| parent | 59b5783df7a80f354f8a996c9a1532a5ab384436 [diff] | |
| parent | e329be2e0004216474fe0545ab7a2cb1863d387a [diff] |
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.