diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-05-03 10:27:13 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-05-03 12:01:21 -0700 |
| commit | 8369df095a73a77b3715f8ae7ba06089cebca4ce (patch) | |
| tree | 1a45d60921e293c6088efeaf4d9c408456f3e0e2 /java/com/android/dialer/interactions | |
| parent | afa29d4a8659eeffc8d92a6216b154f594eeb895 (diff) | |
This change reflects the Dialer V10 RC00 branch.
RC00 is based on:
branch: dialer-android_release_branch/153304843.1
synced to: 153304843
following the instructions at go/dialer-aosp-release.
In this release:
* Removes final apache sources.
* Uses native lite compilation.
More drops will follow with subsequent release candidates
until we reach our final v10 release, in cadence with our
prebuilt drops.
Test: TreeHugger, on device
Change-Id: Ic9684057230f9b579c777820c746cd21bf45ec0f
Diffstat (limited to 'java/com/android/dialer/interactions')
| -rw-r--r-- | java/com/android/dialer/interactions/PhoneNumberInteraction.java | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/interactions/res/values-b+sr+Latn/strings.xml | 23 |
2 files changed, 24 insertions, 1 deletions
diff --git a/java/com/android/dialer/interactions/PhoneNumberInteraction.java b/java/com/android/dialer/interactions/PhoneNumberInteraction.java index f333419ba..52f9d208f 100644 --- a/java/com/android/dialer/interactions/PhoneNumberInteraction.java +++ b/java/com/android/dialer/interactions/PhoneNumberInteraction.java @@ -56,7 +56,7 @@ import com.android.contacts.common.MoreContactUtils; import com.android.contacts.common.util.ContactDisplayUtils; import com.android.dialer.callintent.CallIntentBuilder; import com.android.dialer.callintent.CallIntentParser; -import com.android.dialer.callintent.nano.CallSpecificAppData; +import com.android.dialer.callintent.CallSpecificAppData; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.util.DialerUtils; diff --git a/java/com/android/dialer/interactions/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/interactions/res/values-b+sr+Latn/strings.xml new file mode 100644 index 000000000..46db1d637 --- /dev/null +++ b/java/com/android/dialer/interactions/res/values-b+sr+Latn/strings.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ Copyright (C) 2012 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"> + <string name="sms_disambig_title" msgid="369677069797534410">"Izbor broja"</string> + <string name="call_disambig_title" msgid="2395382326030227603">"Izbor broja"</string> + <string name="make_primary" msgid="9069345357862475091">"Zapamti ovaj izbor"</string> +</resources> |