tree 85229c3c2c0a552499d41ceeba1fc5a61f84060f
parent 6950716c0ea1b55f0da9dd387a96a9a35574f239
parent 3ec81f105927dfc2ccfc170c26c74325d8a63aa1
author Nikita Ioffe <ioffe@google.com> 1571438274 -0700
committer android-build-merger <android-build-merger@google.com> 1571438274 -0700

Merge "vold: implement resetCheckpoint" am: 4eeebff8d5 am: e182b26d64 am: 3631ac59fd
am: 3ec81f1059

Change-Id: I00ce96ee4c6c6f729c5335a04aee08712ee4ae91