diff options
| author | Brian Orr <brianorr@google.com> | 2021-06-15 12:47:53 -0700 |
|---|---|---|
| committer | Daniel Norman <danielnorman@google.com> | 2021-06-17 13:37:54 -0700 |
| commit | 71c831703ae59baf47e0afe611fecd714c481cdf (patch) | |
| tree | 06731a987032723085b9e1a65951cf96abbc19cf /libs/hwui/HardwareBitmapUploader.cpp | |
| parent | 065c9e9a6e9d61d4383a91721eb56a3de253bdbe (diff) | |
| parent | 81833820d54b9a6b27894f9f8dfd72222d416992 (diff) | |
Merge SP1A.210604.001
Change-Id: I5200ee05285ae422d5e9c1c00f45709a5d6188be
Diffstat (limited to 'libs/hwui/HardwareBitmapUploader.cpp')
| -rw-r--r-- | libs/hwui/HardwareBitmapUploader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/HardwareBitmapUploader.cpp b/libs/hwui/HardwareBitmapUploader.cpp index 859a5556323d..db3a1081e32c 100644 --- a/libs/hwui/HardwareBitmapUploader.cpp +++ b/libs/hwui/HardwareBitmapUploader.cpp @@ -24,10 +24,10 @@ #include <GrDirectContext.h> #include <SkCanvas.h> #include <SkImage.h> +#include <gui/TraceUtils.h> #include <utils/GLUtils.h> #include <utils/NdkUtils.h> #include <utils/Trace.h> -#include <utils/TraceUtils.h> #include <thread> |