diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-01-12 08:27:11 -0800 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2017-01-12 08:28:30 -0800 |
| commit | 173215d1b20b70908a9d1807f1372bd95b7ad5f1 (patch) | |
| tree | f9dd70a25c2ca5ae7c766dd5615b1f7af5af3f3e /libs/hwui/Properties.cpp | |
| parent | e86e6d75959787389fcc9b51082b0f33c4553fcd (diff) | |
| parent | ec7e2a164c3792fbaab74f6a9eab7c3cb06296e2 (diff) | |
resolve merge conflicts of ec7e2a164c37 to master
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I49c6e41b79061e2b3c0352e3ac8fa5ebb152b6f5
Diffstat (limited to 'libs/hwui/Properties.cpp')
| -rw-r--r-- | libs/hwui/Properties.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp index a7663817721d..0702010e9875 100644 --- a/libs/hwui/Properties.cpp +++ b/libs/hwui/Properties.cpp @@ -20,9 +20,9 @@ #include <algorithm> #include <cstdlib> -#include <log/log.h> #include <cutils/compiler.h> #include <cutils/properties.h> +#include <log/log.h> namespace android { namespace uirenderer { |