summaryrefslogtreecommitdiffstats
path: root/java/com/android/incallui/disconnectdialog/res/values-ur/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/+24
This is to resolve a merge conflict in: I48296c56fb1d275a06b7c314f5380266c1195ef2 Test: make master is already up to date and Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9 Change-Id: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136