diff options
| author | 2016-12-28 09:28:53 -0800 | |
|---|---|---|
| committer | 2016-12-28 09:29:20 -0800 | |
| commit | c03d283e8b3f830d76dd94822b2a13872c05c730 (patch) | |
| tree | 514c1b1518ea1b3b863856857ad1cd79b88d00f1 /vulkan/libvulkan/stubhal.cpp | |
| parent | f38ec8abdf0a77b3e0e58dbc470a52d2f25a5eb4 (diff) | |
| parent | 525a5f2da844d1acc9e405fc4935d8a1cb2ece67 (diff) | |
resolve merge conflicts of 525a5f2 to master
Test: build
Change-Id: Id1c6d3d9dd158fb086b0d8ab74f7838ef0a51af1
Diffstat (limited to 'vulkan/libvulkan/stubhal.cpp')
| -rw-r--r-- | vulkan/libvulkan/stubhal.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vulkan/libvulkan/stubhal.cpp b/vulkan/libvulkan/stubhal.cpp index 869317bcb9..3de8970475 100644 --- a/vulkan/libvulkan/stubhal.cpp +++ b/vulkan/libvulkan/stubhal.cpp @@ -29,8 +29,10 @@ #include <array> #include <bitset> #include <mutex> + +#include <android/log.h> #include <hardware/hwvulkan.h> -#include <log/log.h> + #include "stubhal.h" namespace vulkan { |