tree 30377e26ac631aaedbb1c6b66b03c278fd524e58
parent 9fdeb57ab0de9eb6eb2d24bd20e2be4b725677af
parent 1d4ef4ba4b1955241bde4dce81441a4bf379bcfa
author Tao Bao <tbao@google.com> 1525900649 -0700
committer android-build-merger <android-build-merger@google.com> 1525900649 -0700

Merge "screen_ui: Fix an issue when displaying wrapped text."
am: 1d4ef4ba4b

Change-Id: I747fa14c2efaf81dd94cd81171424bff845a43b0