diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-08-04 14:54:19 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-08-07 15:21:54 +0000 |
| commit | 10ae593a59aa50963e1d3159747da2d65ca79bed (patch) | |
| tree | 7f98300ff2318f2eefb50d84ca2701a416590fb4 /java/com/android/voicemail/impl/configui/res/values-km/strings.xml | |
| parent | e1a73952372a7ceee493863520e5046e6d979dc0 (diff) | |
| download | android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.tar.gz android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.tar.bz2 android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.zip | |
This change brings Dialer oc-mr1-dev up to date with v11.1 RC06.
This is to resolve a merge conflict in:
I48296c56fb1d275a06b7c314f5380266c1195ef2
Test: make
master is already up to date and
Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9
Change-Id: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136
Diffstat (limited to 'java/com/android/voicemail/impl/configui/res/values-km/strings.xml')
| -rw-r--r-- | java/com/android/voicemail/impl/configui/res/values-km/strings.xml | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/java/com/android/voicemail/impl/configui/res/values-km/strings.xml b/java/com/android/voicemail/impl/configui/res/values-km/strings.xml new file mode 100644 index 000000000..826efd3cd --- /dev/null +++ b/java/com/android/voicemail/impl/configui/res/values-km/strings.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2017 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> +</resources> |