tree 09c457856e43d37e646c9703b07e5baf3ad29f97
parent 5a9de22198b880aa77a038453d86ce7b19ad9555
parent daa0d48e592a4938a022501b400a8e23318a23b3
author Tom Cherry <tomcherry@google.com> 1490128312 +0000
committer android-build-merger <android-build-merger@google.com> 1490128312 +0000

Merge "init: Fix leaking fd and error print" am: e87a826a1d am: ff6eb509aa
am: daa0d48e59

Change-Id: Ica32d27c59e0d4068de7a60f83604315a07bb1fd