tree a2bdd46211f25b98161406966391bc96633b335a
parent 1c24bd6f39b52631f542b459c2998a8a6fe7b03e
parent 01118c1cd819a58a32de021013cdae5ba3f86939
author android-build-prod (mdb) <android-build-team-robot@google.com> 1525314664 -0700
committer android-build-merger <android-build-merger@google.com> 1525314664 -0700

Merge "screen_ui: Use std::string in DrawTextLine() and siblings." am: b4ded4a6ce am: a9d78d45d6
am: 01118c1cd8

Change-Id: I183c66d87b58a0eb55563568e2a263ac170cd851