Merge "Fix include order" am: 0a0b5b5f02

am: 44c18e1723

Change-Id: I80ae48916a7cb5182bb802c6919387204b860b09
gugelfrei
Daniel Rosenberg 5 years ago committed by android-build-merger
commit b7d05eb2fb

@ -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>

Loading…
Cancel
Save