tree 32097b9624fc0c80bf99f91ca55a39d589e19a65
parent 8be4dc7e16d2a90bf13eb21dfdab04ef9608a72c
parent 4431d6cb5b891aa964fa14c1f3e6076892b05e53
author Ajay Panicker <apanicke@google.com> 1474495011 +0000
committer android-build-merger <android-build-merger@google.com> 1474495011 +0000

Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d
am: 4431d6cb5b

Change-Id: Ieeff1ea88cfef281c3ebf42312261a601c18e59d