| commit | ae4abc0aa8e93d56109976933cd863f4249315eb | [log] [tgz] |
|---|---|---|
| author | Adam Seaton <aseaton@google.com> | Thu Oct 26 20:59:57 2017 -0700 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Fri Oct 27 04:03:05 2017 +0000 |
| tree | 2ec51fffcfca47e16bc5249e50e18116c8cc9e3a | |
| parent | 787f654b9bec7469e24fe48e868a1db221d4b473 [diff] |
Fix hi strings after bad merge conflict fix: November EMR (cherry picked from commit bccc819cab8883800bc273ce22f74e94f18a5a2e) Change-Id: I0b2d37a04cfece4ccafaa264485b95c8a663252d