tree b52ab1054a3361efdd496d85baf3d36c0e39060e
parent 3c6b40b97a820125b94378ca82aedb210b40b841
parent 4f4c7263eacf5c6b495df68de6437cfadfb5a543
author Paul Lawrence <paullawrence@google.com> 1561666787 -0700
committer android-build-merger <android-build-merger@google.com> 1561666787 -0700

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

Change-Id: I621ceb7061c43c5023f6aae46e768ba4527b65cd