diff options
| author | 2013-02-13 10:25:12 -0800 | |
|---|---|---|
| committer | 2013-02-13 10:50:20 -0800 | |
| commit | 7c1a49f5f5ed6613d736464bf5001b777e89ced2 (patch) | |
| tree | c6726264bde03f4c5957876921d4b15a835b2c71 /libs/hwui/FontRenderer.cpp | |
| parent | d04892d207d50378356feef181ac4e4eff9652d7 (diff) | |
Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE
This reverts commit 6c0307dd0aefe9a08794b155fc03ee60ebd14f25, reversing
changes made to a2cd828b749c444d55c2c41c7dbb85088ff94b9f.
Conflicts:
packages/SystemUI/res/values-sv/strings.xml
Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e
Diffstat (limited to 'libs/hwui/FontRenderer.cpp')
| -rw-r--r-- | libs/hwui/FontRenderer.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp index d8297daeb636..97988f78454b 100644 --- a/libs/hwui/FontRenderer.cpp +++ b/libs/hwui/FontRenderer.cpp @@ -16,7 +16,6 @@ #define LOG_TAG "OpenGLRenderer" -#include <SkGlyph.h> #include <SkUtils.h> #include <cutils/properties.h> |