summaryrefslogtreecommitdiffstats
path: root/res/values-zu-watch/strings.xml
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2015-11-20 22:06:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-20 22:06:35 +0000
commit3f849f410808a0bca039d73fd763825c73d15419 (patch)
treea9af0794f210bd49a37148dbb2740469ca327ebe /res/values-zu-watch/strings.xml
parent786cf97b83a4e502b8683198cdea8872c8507b93 (diff)
parentef861375eebd9ac6cce7c0bb163380ab1c951063 (diff)
downloadandroid_packages_apps_PackageInstaller-3f849f410808a0bca039d73fd763825c73d15419.tar.gz
android_packages_apps_PackageInstaller-3f849f410808a0bca039d73fd763825c73d15419.tar.bz2
android_packages_apps_PackageInstaller-3f849f410808a0bca039d73fd763825c73d15419.zip
resolve merge conflicts of c10abb25f3 to cw-e-dev.
am: ef861375ee * commit 'ef861375eebd9ac6cce7c0bb163380ab1c951063': resolve merge conflicts of c10abb25f3 to cw-e-dev.
Diffstat (limited to 'res/values-zu-watch/strings.xml')
0 files changed, 0 insertions, 0 deletions