summaryrefslogtreecommitdiffstats
path: root/java/com/android/dialer/util/res/values-ja/strings.xml
Commit message (Collapse)AuthorAgeFilesLines
* This change brings Dialer oc-mr1-dev up to date with v11.1 RC06.Eric Erfanian2017-08-071-0/+2
| | | | | | | | | | | | | This is to resolve a merge conflict in: I48296c56fb1d275a06b7c314f5380266c1195ef2 Test: make master is already up to date and Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9 Change-Id: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136
* Update AOSP Dialer source from internal google3 repository at cl/150392808Eric Erfanian2017-03-171-0/+26
Test: Treehugger Notable this release: * Reintroduce localization. This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from 3/15/2017 to cl/150392808 (3/16/2017). This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Change-Id: Ia16d68469c2ca1ff42c7fa31d922bdb78c4e244a