From e35e4e4e391ceeefb26efb3305e35b92eaac8df6 Mon Sep 17 00:00:00 2001
From: Tom Cherry <tomcherry@google.com>
Date: Tue, 29 Nov 2016 17:20:12 -0800
Subject: [PATCH] fs_mgr: fix header ordering

A merge conflict resolution un-alphabetized the order of these
headers; this commit puts them back in order.

Change-Id: I13c26fbb8f88fe2ce0b332721235b3e4eba7deaf
---
 fs_mgr/fs_mgr_verity.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs_mgr/fs_mgr_verity.cpp b/fs_mgr/fs_mgr_verity.cpp
index bb61b93b5..8c47b3c48 100644
--- a/fs_mgr/fs_mgr_verity.cpp
+++ b/fs_mgr/fs_mgr_verity.cpp
@@ -31,8 +31,8 @@
 
 #include <android-base/file.h>
 #include <android-base/strings.h>
-#include <crypto_utils/android_pubkey.h>
 #include <android-base/unique_fd.h>
+#include <crypto_utils/android_pubkey.h>
 #include <cutils/properties.h>
 #include <logwrap/logwrap.h>
 #include <openssl/obj_mac.h>