| commit | 2075d8d336301e2562434374a5261d449b0c71ca | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Sep 22 22:11:45 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 22 22:11:47 2016 +0000 |
| tree | 379fd80a57a4faab52fa52382a74899c2324220a | |
| parent | 5b396853fb62b374302879653d1785af85c39232 [diff] | |
| parent | de55c4699dfe98a512c2819778cff8816d12fc31 [diff] |
Merge "Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d -s ours am: 7cd1668893 am: a5e128ba97 am: 94c08c2bed -s ours am: d4fe288933 am: f65661939b am: 630d577349 am: c9830d56e5 -s ours am: c5442c263a am: b809b1f8aa am: 0471ffa55c am: 0487464b69" into nyc-mr1-dev-plus-aosp