diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-01-11 08:30:03 -0800 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2017-01-11 08:30:17 -0800 |
| commit | db15537e6e0d35c7ed3b1bef45e421760be70683 (patch) | |
| tree | a37853e5f3889f478cbcd204b46d1c8c640215f2 /libs/hwui/Interpolator.cpp | |
| parent | 505d8262ab8702fea19c926bdff4d66bbbaa766a (diff) | |
| parent | 082a1721b5165420e11319b98eefaa35d0feb844 (diff) | |
resolve merge conflicts of 082a1721b516 to master
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e
Diffstat (limited to 'libs/hwui/Interpolator.cpp')
| -rw-r--r-- | libs/hwui/Interpolator.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/hwui/Interpolator.cpp b/libs/hwui/Interpolator.cpp index f94a22d51d9f..d740c038f36d 100644 --- a/libs/hwui/Interpolator.cpp +++ b/libs/hwui/Interpolator.cpp @@ -16,10 +16,11 @@ #include "Interpolator.h" -#include "utils/MathUtils.h" - #include <algorithm> -#include <cutils/log.h> + +#include <log/log.h> + +#include "utils/MathUtils.h" namespace android { namespace uirenderer { |