| commit | 8735fb890a3a7b16f4014a4da7736939f5e34891 | [log] [tgz] |
|---|---|---|
| author | Torne (Richard Coles) <torne@google.com> | Tue Oct 14 14:33:12 2014 +0100 |
| committer | Torne (Richard Coles) <torne@google.com> | Tue Oct 14 14:33:12 2014 +0100 |
| tree | dd0745b44949033ee4d5d19108ac6d1c4f6630a5 | |
| parent | e494d2acb563ed232164c819857b341286be7c6e [diff] | |
| parent | 15fda1d3fb8d694d7064ebfea7dba42e6131bfd1 [diff] |
Merge glue layer from master. Bring in the following CLs: Import translations. DO NOT MERGE Match removal of config_webSettingsDefaultTextEncoding. Add strings for Play Store text. Use overridden resources. Cherry-pick: Fix resource rewriting in apps with other shared libs. No changes to Chromium are required; these are all glue-layer only changes.