tree 82752ee3ec39d98c17b822b88c380da118ae8ee7
parent 403356117f0eb5153b95c87ba55cf535164820df
parent a74581a635ad2b9f844c1b5110c46fc1733958fa
author Tianjie Xu <xunchang@google.com> 1539409020 -0700
committer android-build-merger <android-build-merger@google.com> 1539409020 -0700

Merge "Use a host java program to generate the background text" am: e4e929ce53
am: a74581a635

Change-Id: I281541e88d0157935ee75eb8e7f1ffdbf3cca0f1