diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-01-12 08:35:35 -0800 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2017-01-12 08:36:11 -0800 |
| commit | e0ea99cc4ba89452b9b6b1baa33bddcb11f3351a (patch) | |
| tree | 1c90d7dda6cbd815a854cd35432d43064d2e1daa /vulkan/libvulkan/api.cpp | |
| parent | ba4d92cc90b5d2a902e898211f04311a0ae2493b (diff) | |
| parent | a2c2d11f98b692401be56c8f285c570bae47ddda (diff) | |
resolve merge conflicts of a2c2d11f9 to master
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I84d0ffa430df3beca0dcc6ed205ce220d7be1f87
Diffstat (limited to 'vulkan/libvulkan/api.cpp')
| -rw-r--r-- | vulkan/libvulkan/api.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vulkan/libvulkan/api.cpp b/vulkan/libvulkan/api.cpp index f5daca7020..e05ca5a83a 100644 --- a/vulkan/libvulkan/api.cpp +++ b/vulkan/libvulkan/api.cpp @@ -23,13 +23,14 @@ #include <stdlib.h> #include <string.h> + #include <algorithm> #include <mutex> #include <new> #include <utility> -#include <android/log.h> #include <cutils/properties.h> +#include <log/log.h> #include <vulkan/vk_layer_interface.h> #include "api.h" |