summaryrefslogtreecommitdiffstats
path: root/VolumeManager.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-08 02:27:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-08 02:27:49 +0000
commitcc733959f68c041b3b62cb30c1fa5c59530a3cb1 (patch)
treea5c65f2c8decda306ec6a798487482f8b56c7b23 /VolumeManager.cpp
parenta13d81bbf58fbaa4b4912f57c35da7e2195a7132 (diff)
parentebbabdc8fb9e238bd2c97fefc5433d837aabab59 (diff)
downloadplatform_system_vold-cc733959f68c041b3b62cb30c1fa5c59530a3cb1.tar.gz
platform_system_vold-cc733959f68c041b3b62cb30c1fa5c59530a3cb1.tar.bz2
platform_system_vold-cc733959f68c041b3b62cb30c1fa5c59530a3cb1.zip
Merge "Refactor: make cryptfs.h smaller" am: 98c501d28e am: 645c2f40a0 am: ebbabdc8fb
Change-Id: If8c533aa196969adf38dcbf85673cebb39a79024
Diffstat (limited to 'VolumeManager.cpp')
-rw-r--r--VolumeManager.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index e6d593a3..4427c9b1 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -63,7 +63,6 @@
#include "VoldNativeService.h"
#include "VoldUtil.h"
#include "VolumeManager.h"
-#include "cryptfs.h"
#include "fs/Ext4.h"
#include "fs/Vfat.h"
#include "model/EmulatedVolume.h"