diff options
| author | Andrew Lee <anwlee@google.com> | 2014-05-09 18:07:20 -0700 |
|---|---|---|
| committer | Andrew Lee <anwlee@google.com> | 2014-05-09 18:07:20 -0700 |
| commit | 46a309dac03b11180f4deffb5316892736796e6e (patch) | |
| tree | d13476544e73c3867ea835a41a4f5315ac8c1a7f /res/values-it/strings.xml | |
| parent | c56d29493dd10d5b22ac70fed91da350949eedba (diff) | |
| parent | 41ffd6562c14fb20a87013db41226c0e69207cc4 (diff) | |
| download | packages_apps_InCallUI-46a309dac03b11180f4deffb5316892736796e6e.tar.gz packages_apps_InCallUI-46a309dac03b11180f4deffb5316892736796e6e.tar.bz2 packages_apps_InCallUI-46a309dac03b11180f4deffb5316892736796e6e.zip | |
resolved conflicts for merge of 41ffd656 to master-nova
Change-Id: Ie8f34527c54b99e4e6530ff9ccf2bfb24f222487
Diffstat (limited to 'res/values-it/strings.xml')
0 files changed, 0 insertions, 0 deletions