| commit | 7b3aaf638fe538ee8e49cc000aa51d66076bfc61 | [log] [tgz] |
|---|---|---|
| author | Ajay Panicker <apanicke@google.com> | Fri Sep 23 00:31:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 23 00:31:55 2016 +0000 |
| tree | dcb56acacba81eb9511d6b04be1c6be020446568 | |
| parent | 4d81efaf616e5060c8cb84f238ebde2fe4518477 [diff] | |
| parent | f8033cb4f9df6ee6fac1deb9e9db3c1e8ede557e [diff] |
Merge "Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9 -s ours am: a70fffe8e7 am: d677e8d413 am: 73607db5a1 am: 05cd9942d9 -s ours am: 745254f98b am: d91f2f4d2b am: c20376b2a0 am: 4a1b8d7aba" into nyc-mr1-dev-plus-aosp am: f8033cb4f9 -s ours Change-Id: I015dd7d4c76bf60a5e1983beac00f4615c05d001