tree 77d6b160ef66f570c8deba1e6ef8e139ef3c3b69
parent 7ca2c0ddf2381d6382bacc0a689886ede462c02c
parent 5d4855680d9c1aa4b539e87f60fe4efc9bf35ee1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583196452 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583196452 +0000

Merge "fs_mgr: remain elapsed time of fsck in prop" am: 5d4855680d

Change-Id: I057410e062f702c8543e5c9ca9f02c926d80c023