diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-04-12 08:56:20 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2017-04-12 09:11:38 -0700 |
| commit | 1ae7379baab4b2941ad1701190718cf53a051b48 (patch) | |
| tree | 74cd60feb4b9388ff04dadbe0f933b13fce36f42 /modules/hwcomposer/hwcomposer.cpp | |
| parent | 9e610d1a3be65117f478f59f3ef4c38c5295afb6 (diff) | |
| parent | 7c451a9347f39b82113d5cfae36bf4de67c5171a (diff) | |
resolve merge conflicts of 7c451a93 to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: 34250038
Change-Id: I4196a6d5a1365106643ac6c1548fd86faffead6f
Diffstat (limited to 'modules/hwcomposer/hwcomposer.cpp')
| -rw-r--r-- | modules/hwcomposer/hwcomposer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/hwcomposer/hwcomposer.cpp b/modules/hwcomposer/hwcomposer.cpp index 7b2e278b..fd4e90dd 100644 --- a/modules/hwcomposer/hwcomposer.cpp +++ b/modules/hwcomposer/hwcomposer.cpp @@ -14,15 +14,14 @@ * limitations under the License. */ -#include <hardware/hardware.h> - #include <errno.h> #include <fcntl.h> #include <malloc.h> -#include <cutils/log.h> #include <cutils/atomic.h> +#include <log/log.h> +#include <hardware/hardware.h> #include <hardware/hwcomposer.h> #include <EGL/egl.h> |