diff options
author | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-05-02 00:53:55 +0300 |
---|---|---|
committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2016-05-13 14:01:37 -0700 |
commit | 67c3e9d6220fea99032509abd35b7cfaaafff7c6 (patch) | |
tree | acca6c0e304c979a234fc1182994d222cfcdf966 | |
parent | 85b6cd5e4761c17cf92752eb25e189172b18b9f9 (diff) | |
download | android_packages_providers_MediaProvider-67c3e9d6220fea99032509abd35b7cfaaafff7c6.tar.gz android_packages_providers_MediaProvider-67c3e9d6220fea99032509abd35b7cfaaafff7c6.tar.bz2 android_packages_providers_MediaProvider-67c3e9d6220fea99032509abd35b7cfaaafff7c6.zip |
Revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/providers/MediaProvider into cm-13.0"
This reverts commit 637eb43027b69d91fbeca7ca2bf11f58998a9929, reversing
changes made to 8a3b33c20e9bfd96922f8c72a38db971b63f95d6.
RM-231
Change-Id: I5e1eea9705da9a3f8f4903e387f3ab0039b76743
(cherry picked from commit d4592ab07637c98cdd1b12898a43bdc78a840674)
-rw-r--r-- | res/values-ca/strings.xml | 2 | ||||
-rw-r--r-- | res/values-nl/strings.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 271db61c..ae8b0804 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -19,7 +19,7 @@ <string name="uid_label" msgid="999888504096344278">"Multimèdia"</string> <string name="app_label" msgid="581696352855930028">"Emmagatzematge de mitjans"</string> <string name="artist_label" msgid="1181678850424271227">"Intèrpret"</string> - <string name="ringtone_default" msgid="3332469542084549546">"To predeterminat"</string> + <string name="ringtone_default" msgid="3332469542084549546">"So predeterminat"</string> <string name="notification_sound_default" msgid="5309766396223094324">"So de notificació predeterminat"</string> <string name="alarm_sound_default" msgid="6854264112790616066">"So d\'alarma predeterminat"</string> <string name="root_images" msgid="7098113056247445324">"Imatges"</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 3b1ac642..2c02d148 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -20,7 +20,7 @@ <string name="app_label" msgid="581696352855930028">"Mediaopslag"</string> <string name="artist_label" msgid="1181678850424271227">"Artiest"</string> <string name="ringtone_default" msgid="3332469542084549546">"Standaardbeltoon"</string> - <string name="notification_sound_default" msgid="5309766396223094324">"Standaardmeldingsgeluid"</string> + <string name="notification_sound_default" msgid="5309766396223094324">"Standaard meldingsgeluid"</string> <string name="alarm_sound_default" msgid="6854264112790616066">"Standaardalarmgeluid"</string> <string name="root_images" msgid="7098113056247445324">"Afbeeldingen"</string> <string name="root_videos" msgid="3304457332406057833">"Video\'s"</string> |