tree 547ff1b0f3085343ecc5e87da389b20fe4a59088
parent 8ba57f5b608811003793c6faaa810b44fe2b8b52
parent 69c1204d6de0624315e233dea59a8e5ccaacb402
author Erik Kline <ek@google.com> 1519368483 +0000
committer android-build-merger <android-build-merger@google.com> 1519368483 +0000

Merge "Slightly refactor signal handling and fd closing" am: 1f332b2dde
am: 69c1204d6d

Change-Id: I1a2fc0d0256d781f16783cfa2f2235fb5d6e1c46