diff options
| author | 2017-01-11 08:30:03 -0800 | |
|---|---|---|
| committer | 2017-01-11 08:30:17 -0800 | |
| commit | db15537e6e0d35c7ed3b1bef45e421760be70683 (patch) | |
| tree | a37853e5f3889f478cbcd204b46d1c8c640215f2 /libs/hwui/SkiaCanvasProxy.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/SkiaCanvasProxy.cpp')
| -rw-r--r-- | libs/hwui/SkiaCanvasProxy.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/hwui/SkiaCanvasProxy.cpp b/libs/hwui/SkiaCanvasProxy.cpp index c5156cfd6844..f32612d21319 100644 --- a/libs/hwui/SkiaCanvasProxy.cpp +++ b/libs/hwui/SkiaCanvasProxy.cpp @@ -16,9 +16,11 @@ #include "SkiaCanvasProxy.h" -#include "hwui/Bitmap.h" +#include <memory> + +#include <log/log.h> -#include <cutils/log.h> +#include "hwui/Bitmap.h" #include <SkLatticeIter.h> #include <SkPatchUtils.h> #include <SkPaint.h> @@ -30,8 +32,6 @@ #include <SkSurface.h> #include <SkTextBlobRunIterator.h> -#include <memory> - namespace android { namespace uirenderer { |