diff options
| author | Chris Craik <ccraik@google.com> | 2014-11-20 16:38:06 -0800 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2014-11-20 16:38:06 -0800 |
| commit | f2235b6a48db2e16b52711570bf2a0d0cb0b0d90 (patch) | |
| tree | 159f121d1330bba957764704de13720e785f3e3b /libs/hwui/font | |
| parent | cd24a6d70b54c79605e51fcc6a249313e9c25a51 (diff) | |
| parent | 57b641a2ed87f2827399c363053436cba88bee75 (diff) | |
| download | frameworks_base-f2235b6a48db2e16b52711570bf2a0d0cb0b0d90.zip frameworks_base-f2235b6a48db2e16b52711570bf2a0d0cb0b0d90.tar.gz frameworks_base-f2235b6a48db2e16b52711570bf2a0d0cb0b0d90.tar.bz2 | |
resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp.
Change-Id: I1be708f5a0cd4d64021a57f1063d54330f1d2d7e
Diffstat (limited to 'libs/hwui/font')
| -rw-r--r-- | libs/hwui/font/Font.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/font/Font.cpp b/libs/hwui/font/Font.cpp index bf55558..49bf4d6 100644 --- a/libs/hwui/font/Font.cpp +++ b/libs/hwui/font/Font.cpp @@ -363,7 +363,7 @@ void Font::measure(const SkPaint* paint, const char* text, uint32_t start, uint3 } void Font::precache(const SkPaint* paint, const char* text, int numGlyphs) { - ATRACE_NAME("precacheText"); + ATRACE_NAME("Precache Glyphs"); if (numGlyphs == 0 || text == NULL) { return; |