tree e3141f92cfbbb01488324ad67ed25df3ec7e7c53
parent a4a04f5717a8b62ab913749b429896e9ae2a0eba
parent 5f19ef31c87ec195251a849285cc2221535c21c4
author Paul Lawrence <paullawrence@google.com> 1561658583 -0700
committer android-build-merger <android-build-merger@google.com> 1561658583 -0700

Merge "Make ext4 userdata checkpoints work with metadata encryption" am: 2c792e0720
am: 5f19ef31c8

Change-Id: I7da7077c70484cb5873b9316058bc73158c19ab6