commit | 0cc5cc4e6ea05ac3d61b79cf79ead585f9e0b3f6 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Sep 22 22:31:19 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Sep 22 22:31:21 2016 +0000 |
tree | 31c2c2311fafcd4ef94655692fe0b71af51bbd34 | |
parent | 8a0bb0b0e9f01a75b40031e8f3ec1f3e196317f9 [diff] | |
parent | 9db8240bb10a6f2d726df6d317ce26e29deb91e3 [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: 7b348ecc95" into nyc-mr1-dev-plus-aosp