tree 1e984a1d6f0242f78fb65ddce0a8766688519e06
parent 13b64beab63fc11222538f805ea0b09564dc6e96
parent 641692f11d673c14c020b8d34589c134733fba62
author Tao Bao <tbao@google.com> 1525901558 -0700
committer android-build-merger <android-build-merger@google.com> 1525901558 -0700

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

Change-Id: Iee1226324747ba810e808b99b03a6971db2a6858