tree 43baec0d7da0285e9ec355150cc0d48c1f73f40b
parent 9e9e9143b08c77dabc8e7f663d6c96ec698836ba
parent 69199c70ecdcb6ad046c969c0d6ae7086771f0c1
author Nikita Ioffe <ioffe@google.com> 1576090040 -0800
committer android-build-merger <android-build-merger@google.com> 1576090040 -0800

Merge "Allow fscrypt_mount_metadata_encrypted to be called more than once"
am: 69199c70ec

Change-Id: I743a9bbcca76af3fc1701d315e7e053b7ebea57e