tree 61b7ce20c5a3e8866342b3054f3a030ce1e88c70
parent dd369ccddfd166a6dc4c7e483a773c9e6887a2cc
parent e96e670746d05156fdf04eb2f8e1af19f33997ea
author Paul Crowley <paulcrowley@google.com> 1572027642 -0700
committer android-build-merger <android-build-merger@google.com> 1572027642 -0700

Merge "Use new C++ libfscrypt interface." am: 7e43d985cf
am: e96e670746

Change-Id: Ia3caaae26d30f5f3329ae36c1aac02e592118d0b