summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author Roozbeh Pournader <roozbeh@google.com> 2015-10-16 22:20:01 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-10-16 22:20:01 +0000
commitca9dbf596df379c5e280235b7a88011b2197f982 (patch)
treed89cf8e409fdf5a186007b2e1242d27777deff70 /libs/hwui/Program.cpp
parent072c5bdff77e354bdf333c0c1d460cdd1c2e76ae (diff)
parentebdf60e7c800b2ccda01887a304ddc0edce0361d (diff)
am ebdf60e7: am 0221328c: am b3538082: am 5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
* commit 'ebdf60e7c800b2ccda01887a304ddc0edce0361d': Fix line height problem with inline images in StaticLayout.
Diffstat (limited to 'libs/hwui/Program.cpp')
0 files changed, 0 insertions, 0 deletions