summaryrefslogtreecommitdiff
path: root/libs/hwui/FontRenderer.cpp
diff options
context:
space:
mode:
author Chong Zhang <chz@google.com> 2013-08-20 11:30:33 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-08-20 11:30:33 -0700
commit8742fa367eeebbc0c5d027a92e7197b554bb7be1 (patch)
tree3699816023d2ad5db5b6042a5256a9a53ca43824 /libs/hwui/FontRenderer.cpp
parentec818c6f4aa4d3df4fa323a92c2b022ac65ae4cb (diff)
parentce063ca19b0a2bb6fd3dc7875df02cb186ad0c8a (diff)
am ce063ca1: am ea18a8db: Merge "MediaPlayer: add listener for subtitle data" into klp-dev
* commit 'ce063ca19b0a2bb6fd3dc7875df02cb186ad0c8a': MediaPlayer: add listener for subtitle data
Diffstat (limited to 'libs/hwui/FontRenderer.cpp')
0 files changed, 0 insertions, 0 deletions