tree 6e6a9f673d0a74a7efbf70bfcf2d4a7b67ef45fe
parent 66571856a1d894d695e1583b72cbbc5732d5bc91
parent b33a6f8342b35a514bee6d434f440c65f956d9c7
author Johan Harvyl <johan.harvyl@sonymobile.com> 1470773057 +0000
committer android-build-merger <android-build-merger@google.com> 1470773057 +0000

Merge "Handle error from fopen_path in finish_recovery" am: 8a4333f3b9 am: a550ee0df7
am: b33a6f8342

Change-Id: I24871e2d2259cb3444082ae89e4a59979ad5e197