diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-21 17:01:26 -0700 |
|---|---|---|
| committer | Ed Heyl <edheyl@google.com> | 2015-07-22 11:31:04 -0700 |
| commit | e612775922ec9f8cc4e5cb976bc62b3312a3de0e (patch) | |
| tree | 96beaf07307486f6491f022da63ebe381765d1a8 /res/values-rm/strings.xml | |
| parent | a83129f0bc778fd1ccd799bd8cfa40270f632e1d (diff) | |
| download | android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.gz android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.bz2 android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.zip | |
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
b/22609402
Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
Diffstat (limited to 'res/values-rm/strings.xml')
| -rw-r--r-- | res/values-rm/strings.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index be35c6b09..0758148f5 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -152,8 +152,6 @@ <skip /> <!-- no translation found for first_run_cling_description (6447072552696253358) --> <skip /> - <string name="first_run_cling_custom_content_hint" msgid="6090628589029352439"></string> - <string name="first_run_cling_search_bar_hint" msgid="5909062802402452582"></string> <!-- no translation found for first_run_cling_create_screens_hint (6950729526680114157) --> <skip /> <!-- no translation found for migration_cling_title (9181776667882933767) --> |