tree 9a4ce586d0a1d96718c36ba0acfb5e8afeecc638
parent cd5df6e1ef2c7d66fcfa99e2e1bf96473625a678
parent dde9704664592d9b675935fa27d57e793b13847f
author Paul Lawrence <paullawrence@google.com> 1561677915 -0700
committer android-build-merger <android-build-merger@google.com> 1561677915 -0700

Merge "Make ext4 userdata checkpoints work with metadata encryption" into qt-dev
am: dde9704664

Change-Id: I091c8d095b29dc966da86c2d4c93281615043355