From 1cd093795ebc74ff14efac11fb7e6b088bf5a92b Mon Sep 17 00:00:00 2001
From: "John W. Bruce" <juce@google.com>
Date: Tue, 15 Jan 2019 16:46:14 -0800
Subject: [PATCH] Resolve Merge Disparity

The same merge conflict happened in the Widevine and Android repos, but
it was resolved differently. This patch brings the resolutions back in
sync.

Bug: 111504510
Bug: 111505796
Bug: 115358798
Test: Android Build
Change-Id: I5161ae3e1aad41ee034dc5fec59dad1c7699d65c
---
 libwvdrmengine/test/unit/WVDrmFactory_test.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libwvdrmengine/test/unit/WVDrmFactory_test.cpp b/libwvdrmengine/test/unit/WVDrmFactory_test.cpp
index a47a69e5..3fc74317 100644
--- a/libwvdrmengine/test/unit/WVDrmFactory_test.cpp
+++ b/libwvdrmengine/test/unit/WVDrmFactory_test.cpp
@@ -4,12 +4,11 @@
  * License Agreement.
  */
 
+#include "android-base/properties.h"
 #include "cutils/properties.h"
 #include "gtest/gtest.h"
-#include "WVDrmFactory.h"
 #include "HidlTypes.h"
-
-#include "android-base/properties.h"
+#include "WVDrmFactory.h"
 
 namespace wvdrm {
 namespace hardware {