tree 547ff1b0f3085343ecc5e87da389b20fe4a59088
parent 210f8e5ed6be424a1334353f18a857790004322c
parent c30c6a1a6e5daee0c8febad2fb8751b000478016
author Erik Kline <ek@google.com> 1519368784 +0000
committer android-build-merger <android-build-merger@google.com> 1519368784 +0000

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

Change-Id: I5f015468cf144c07f17305cb55efebecfe486244