widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve Merge Disparity

Browse Source 
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
This commit is contained in:
John W. Bruce
2019-01-15 16:46:14 -08:00
parent ef00d6ffa5
commit 1cd093795e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/test/unit/WVDrmFactory_test.cpp
View File

@@ -4,12 +4,11 @@
* License Agreement. * License Agreement.
*/ */
#include "android-base/properties.h"
#include "cutils/properties.h" #include "cutils/properties.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "WVDrmFactory.h"
#include "HidlTypes.h" #include "HidlTypes.h"
#include "WVDrmFactory.h"
#include "android-base/properties.h"
namespace wvdrm { namespace wvdrm {
namespace hardware { namespace hardware {