tree a2bdd46211f25b98161406966391bc96633b335a
parent 1875991c71586c7902288dcb2dd323b75cc754d0
parent a9d78d45d689e3c4d905b5200da5a6da0339e5d6
author android-build-prod (mdb) <android-build-team-robot@google.com> 1525314062 -0700
committer android-build-merger <android-build-merger@google.com> 1525314062 -0700

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

Change-Id: I6b4ea6332a9416ac8036cd9c2d1d23695a7c5914