tree 3963f48ee3eb69248792e6bc62aff300d835cae5
parent 6cc4df26d608522ebf6ac43b19a09eef16513d8a
parent 0908ca721a27eb4a9ae892839f9fed34e6dd0116
author Tom Cherry <tomcherry@google.com> 1501878776 +0000
committer android-build-merger <android-build-merger@google.com> 1501878776 +0000

Merge "init: more unique_fd, less goto" am: 401c9cb330
am: 0908ca721a

Change-Id: Iab85433cbe327daf6854444dc235adf31acd0925