diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-11 03:47:09 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-11 16:58:39 -0800 |
| commit | 0e1dbed9194839a90755670d8fdf9046a75b85f7 (patch) | |
| tree | 010372762ddc617295da2862f7d61813da9e3586 /packages/FusedLocation | |
| parent | 564f10b8f05ddf4d9ea2c0e64f1b113fe6dad4b8 (diff) | |
| parent | e342181a4a8d8177b3b87ffe141777565fe98f15 (diff) | |
| download | frameworks_base-0e1dbed9194839a90755670d8fdf9046a75b85f7.zip frameworks_base-0e1dbed9194839a90755670d8fdf9046a75b85f7.tar.gz frameworks_base-0e1dbed9194839a90755670d8fdf9046a75b85f7.tar.bz2 | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/base into cm-13.0
Android 6.0.1 release 22
Change-Id: I0d31899b234156a91accb61e0a7fb3d8d16d5062
Diffstat (limited to 'packages/FusedLocation')
| -rw-r--r-- | packages/FusedLocation/res/values-az-rAZ/strings.xml | 5 | ||||
| -rw-r--r-- | packages/FusedLocation/res/values-kk-rKZ/strings.xml | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/packages/FusedLocation/res/values-az-rAZ/strings.xml b/packages/FusedLocation/res/values-az-rAZ/strings.xml deleted file mode 100644 index 31962e4..0000000 --- a/packages/FusedLocation/res/values-az-rAZ/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_label" msgid="5379477904423203699">"Qarışmış Yer"</string> -</resources> diff --git a/packages/FusedLocation/res/values-kk-rKZ/strings.xml b/packages/FusedLocation/res/values-kk-rKZ/strings.xml index 0d2cccc..c90831d 100644 --- a/packages/FusedLocation/res/values-kk-rKZ/strings.xml +++ b/packages/FusedLocation/res/values-kk-rKZ/strings.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_label" msgid="5379477904423203699">"Fused Location"</string> + <string name="app_label" msgid="5379477904423203699">"Аймақ табу құралдарының торабы"</string> </resources> |