tree aef8defd220228d40779fbe9d25e5944b4ad06b5
parent a66cf9ce0c6315cebce4a0e74685aa9addf54da9
parent 8fe381f0fdde205835587aa84444d4d2ccad8d7a
author Erik Kline <ek@google.com> 1531185041 -0700
committer android-build-merger <android-build-merger@google.com> 1531185041 -0700

[automerger skipped] Merge "Always close file descriptors" into pi-dev
am: 8fe381f0fd  -s ours

Change-Id: I831da822dea43107aafd6a5ad54a4a7832d0699a