tree 2ec51fffcfca47e16bc5249e50e18116c8cc9e3a
parent 9cfebe36e6429ce477da209eaaba8d23d72679ea
author Adam Seaton <aseaton@google.com> 1509076797 -0700
committer android-build-team Robot <android-build-team-robot@google.com> 1509077113 +0000

Fix hi strings after bad merge conflict fix: November EMR
(cherry picked from commit bccc819cab8883800bc273ce22f74e94f18a5a2e)

Change-Id: Ie8c17f403acd8538db00cea18dcfc870d490df84