tree 1fc9e57bb71b0fe8de5abae0b725d768ccb414f7
parent b02c30cbf39e04932057750f005d413cb7bc7e94
parent a2518c7fe7eb45a0ac75fef292e357001492ad43
author Xin Li <delphij@google.com> 1559945844 -0700
committer android-build-merger <android-build-merger@google.com> 1559945844 -0700

Merge "Restore historical behavior with fsck_msdos (always accept fixes)."
am: a2518c7fe7

Change-Id: I91202edd2dbca6e8eb4c58fa25453da22045a062