Merge "Fix include order" am: 0a0b5b5f02 am: 44c18e1723

am: b7d05eb2fb Change-Id: Ie3ee4adf6457d0f469583ffd6bdc75872a8a77f0
5 years ago · 7723b785c4
parent 911454093c b7d05eb2fb
commit 7723b785c4
1 changed files with 2 additions and 2 deletions
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@ -16,10 +16,10 @@

 #include "KeyStorage.h"

+#include "Checkpoint.h"
 #include "Keymaster.h"
 #include "ScryptParameters.h"
 #include "Utils.h"
-#include "Checkpoint.h"

 #include <thread>
 #include <vector>
@ -37,8 +37,8 @@

 #include <android-base/file.h>
 #include <android-base/logging.h>
-#include <android-base/unique_fd.h>
 #include <android-base/properties.h>
+#include <android-base/unique_fd.h>

 #include <cutils/properties.h>