Merge "Fix include order"

am: 0a0b5b5f02

Change-Id: I002b546d733dd55ced79aeb118c6394ce973d609
gugelfrei
Daniel Rosenberg 5 years ago committed by android-build-merger
commit 44c18e1723

@ -16,10 +16,10 @@
#include "KeyStorage.h" #include "KeyStorage.h"
#include "Checkpoint.h"
#include "Keymaster.h" #include "Keymaster.h"
#include "ScryptParameters.h" #include "ScryptParameters.h"
#include "Utils.h" #include "Utils.h"
#include "Checkpoint.h"
#include <thread> #include <thread>
#include <vector> #include <vector>
@ -37,8 +37,8 @@
#include <android-base/file.h> #include <android-base/file.h>
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android-base/unique_fd.h>
#include <android-base/properties.h> #include <android-base/properties.h>
#include <android-base/unique_fd.h>
#include <cutils/properties.h> #include <cutils/properties.h>

Loading…
Cancel
Save