summaryrefslogtreecommitdiffstats
path: root/res/values-sv/strings.xml
diff options
context:
space:
mode:
authorWinson <winsonc@google.com>2015-09-29 17:39:37 -0700
committerWinson <winsonc@google.com>2015-09-29 17:39:37 -0700
commite993c4b2757209b1e2e0408eaa2e850fe95e7b63 (patch)
treecd1c3dbacdbe1fbde7b8c79a3ad34ae41cfffeb6 /res/values-sv/strings.xml
parenta3b240d32bf9e65b4ba80b28ad28eef0a1fd677b (diff)
parent850de64c0d0985fb6fe9bbe7c276370c8b13c839 (diff)
downloadandroid_packages_apps_Trebuchet-e993c4b2757209b1e2e0408eaa2e850fe95e7b63.tar.gz
android_packages_apps_Trebuchet-e993c4b2757209b1e2e0408eaa2e850fe95e7b63.tar.bz2
android_packages_apps_Trebuchet-e993c4b2757209b1e2e0408eaa2e850fe95e7b63.zip
resolved conflicts for 850de64c to ub-launcher3-master
Change-Id: Ica4893082f03afe76abd42dca44016eb9e436c35
Diffstat (limited to 'res/values-sv/strings.xml')
0 files changed, 0 insertions, 0 deletions