tree 1e984a1d6f0242f78fb65ddce0a8766688519e06
parent e6a50aa78d49ca48dffc38a2f0fa229854ff6a80
parent ae4b00c427aa9205a0654c206373fbbf3e482365
author Tao Bao <tbao@google.com> 1525900861 -0700
committer android-build-merger <android-build-merger@google.com> 1525900861 -0700

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

Change-Id: I86f3679c38b45c198daf57793a13f800574e1740