tree 28ab0829b28bbdbbb51c83d6c54390ecf95e819e
parent 6011d9a4faed754660fb7080dd9433d2dc033887
parent 85ec116a3244979d3a67aff0b61064f7fa8f106f
author Elliott Hughes <enh@google.com> 1502148505 +0000
committer android-build-merger <android-build-merger@google.com> 1502148505 +0000

Avoid double-free/double-fclose on error. am: 332513d0d2 am: 6c5b3c3fed am: 8d222cd40c am: e1b95886e2
am: 85ec116a32

Change-Id: I6e0ac3d3bd9cc300c56eea42875aa96e508552d3