Merge "Fix caption text being cut off when text size is set to very large." into nyc-mr1-dev
am: cf988e3d64
Change-Id: Ie46fff82f0630407d46fc21f8b1558acdcaea063
This commit is contained in:
am: cf988e3d64
Change-Id: Ie46fff82f0630407d46fc21f8b1558acdcaea063