diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-08-31 06:57:16 -0700 |
|---|---|---|
| committer | Roland Levillain <rpl@google.com> | 2017-09-04 18:05:19 +0100 |
| commit | fc0eb8ccebcc7846db5e8b5c5430070055679bfa (patch) | |
| tree | a8a23c3202e4161ffd57a71095a404db1bcf5735 /java/com/android/dialer/calllogutils/res/values-ca | |
| parent | ea7b4dc89590ffa3332766a531e0eab6ffb9aebd (diff) | |
| download | android_packages_apps_Dialer-fc0eb8ccebcc7846db5e8b5c5430070055679bfa.tar.gz android_packages_apps_Dialer-fc0eb8ccebcc7846db5e8b5c5430070055679bfa.tar.bz2 android_packages_apps_Dialer-fc0eb8ccebcc7846db5e8b5c5430070055679bfa.zip | |
Update Dialer source to latest internal Google revision.
Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.
The Dialer team is now switching to a public development model similar
to the telephony team.
This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.
(cherry picked from commit 2ca4318cc1ee57dda907ba2069bd61d162b1baef
and amended to match paths of dependencies under
prebuilts/maven_repo/bumptech/com/github/bumptech/glide/.)
This CL was generated using these commands from a repository at
stage-stage-master at revision ea7b4dc89590ffa3332766a531e0eab6ffb9aebd
("Merge "Update Dialer source to latest internal Google revision." am: c39ea3c55f -s ours"):
git diff --binary 2ca4318cc1ee57dda907ba2069bd61d162b1baef | git apply -R --index
git commit -c 2ca4318cc1ee57dda907ba2069bd61d162b1baef
Test: make, flash install, run
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
Diffstat (limited to 'java/com/android/dialer/calllogutils/res/values-ca')
| -rw-r--r-- | java/com/android/dialer/calllogutils/res/values-ca/strings.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/com/android/dialer/calllogutils/res/values-ca/strings.xml b/java/com/android/dialer/calllogutils/res/values-ca/strings.xml index ad993e39f..6441b44e2 100644 --- a/java/com/android/dialer/calllogutils/res/values-ca/strings.xml +++ b/java/com/android/dialer/calllogutils/res/values-ca/strings.xml @@ -49,4 +49,5 @@ <string name="description_via_number" msgid="7682575124846343076">"al número <xliff:g id="NUMBER">%1$s</xliff:g>"</string> <string name="description_via_number_phone_account" msgid="4345445677508018830">"a <xliff:g id="PHONEACCOUNT">%1$s</xliff:g>, al número <xliff:g id="NUMBER">%2$s</xliff:g>"</string> <string name="voicemail_string" msgid="6029775151483803006">"Bústia de veu"</string> + <string name="now" msgid="2599778506439006806">"Ara"</string> </resources> |