tree d2e9ed4834ec9036587b5984fbc80666ba6f879d
parent 60e41b7084b7a2f33ccacd23e65f70fcc0c6ad2f
parent 1bb7e8a9289fdcf8805aaff13a5745be13b83bac
author Paul Lawrence <paullawrence@google.com> 1592517647 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592517647 +0000

Merge "Don't call block checkpoint functions above dm-default-key" am: 1bb7e8a928

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1330879

Change-Id: Ifa48af749baa5d50c7459dbb5bda1573d847b622