tree 7d395581e0766fc83bedc24f90e0eefff6915f5e
parent 274eb164223f14941ef5421a3b36f010a7d274e3
parent b2ce87de12ae0501a41fa0a92093ba15a1f56251
author Keun-young Park <keunyoung@google.com> 1487194434 +0000
committer android-build-merger <android-build-merger@google.com> 1487194434 +0000

Merge "Revert "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled"" am: cbb91a538f
am: b2ce87de12

Change-Id: I754d121a0d94a281cbdcb8642d0bb9722f0be5b0