Merge "Additional merges from cdm master"

2015-10-07 20:42:38 +00:00
parent ad3908e731 0fe3f79cc3
commit 72e4a10a8b
10 changed files with 25 additions and 14 deletions
--- a/libwvdrmengine/cdm/core/include/device_files.h
+++ b/libwvdrmengine/cdm/core/include/device_files.h
@@ -4,6 +4,7 @@
 #define WVCDM_CORE_DEVICE_FILES_H_

 #include <unistd.h>
+
 #include <set>
 #include <string>