Andreas Gampe 64bb413a66 Revert "resolved conflicts for merge of 220c3f4f to master" ...

Reverted as hwui doesn't agree.

This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.

Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a

2014-11-22 00:35:09 +00:00

..

CachedGlyphInfo.h

…

CacheTexture.cpp

…

CacheTexture.h

…

Font.cpp

Revert "resolved conflicts for merge of 220c3f4f to master"

2014-11-22 00:35:09 +00:00

Font.h

…

FontUtil.h

…