commit 3b71fc51005ac566fd8120f01b784d5f251ad886
author Paul Crowley <paulcrowley@google.com> Mon Oct 09 10:55:21 2017 -0700
committer Paul Crowley <paulcrowley@google.com> Mon Oct 09 13:36:35 2017 -0700
tree c22d02f2289489295fcfce999e898942cd6ae6f5
parent a7ca40bd70408d96e13abb71f9236000b4650454

Be more C++. volume UUID should always be std::string.

Test: boots
Bug: 67041047
Change-Id: I36d3944ae8de192703b9ee359900841b833fe3a1

model/Disk.cpp

diff --git a/model/Disk.cpp b/model/Disk.cpp
index c889a35..5b0c981 100644
--- a/model/Disk.cpp
+++ b/model/Disk.cpp
@@ -23,10 +23,11 @@
 #include "Ext4Crypt.h"
 
 #include <android-base/file.h>
+#include <android-base/logging.h>
 #include <android-base/properties.h>
 #include <android-base/stringprintf.h>
-#include <android-base/logging.h>
 #include <diskconfig/diskconfig.h>
+#include <ext4_utils/ext4_crypt.h>
 
 #include <vector>
 #include <fcntl.h>