tree 3694504384c93004a459e1c3655c5eda1d9e2eed
parent 5a7cace2fc03ac85f8434156b480c15154db3fcc
parent e182b26d64fef7927cc45ee78ae067b4875ffa53
author Nikita Ioffe <ioffe@google.com> 1571437355 -0700
committer android-build-merger <android-build-merger@google.com> 1571437355 -0700

Merge "vold: implement resetCheckpoint" am: 4eeebff8d5
am: e182b26d64

Change-Id: I3000b9adae1bc43f1ccdd36d313556dd93be2a33