commit b7d05eb2fb90090fb6ed377ceed84a8b4605076e
author Daniel Rosenberg <drosen@google.com> Fri Jun 07 18:55:10 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 07 18:55:10 2019 -0700
tree eb67eb5c171e647d70ba7b20b3b65c3f410e9e4f
parent 5890c72489b8d3ce3a1972bf564e2d1a82ec95fb
parent 44c18e1723befcac3d2563e59335f653c06830b6

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

Change-Id: I80ae48916a7cb5182bb802c6919387204b860b09

KeyStorage.cpp

diff --git a/KeyStorage.cpp b/KeyStorage.cpp
index 0290086..271a220 100644
--- 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>