summaryrefslogtreecommitdiffstats
path: root/res/values-tr-watch
diff options
context:
space:
mode:
authorLalit Kansara <lkansara@codeaurora.org>2016-12-06 14:56:49 +0530
committerLalit Kansara <lkansara@codeaurora.org>2016-12-06 14:56:49 +0530
commit14ee72e6db5d7e33d061176e7e6d06e1d0475882 (patch)
tree933f97c4bddd3e5408c35a28a24f990095fedefe /res/values-tr-watch
parent7f3bc87a69368ecdc9a27d8c6a21ee4b2d7fd32f (diff)
parentb26b9425d700359d6ee68d45ac334fd1f2ab82d4 (diff)
downloadandroid_packages_apps_PackageInstaller-14ee72e6db5d7e33d061176e7e6d06e1d0475882.tar.gz
android_packages_apps_PackageInstaller-14ee72e6db5d7e33d061176e7e6d06e1d0475882.tar.bz2
android_packages_apps_PackageInstaller-14ee72e6db5d7e33d061176e7e6d06e1d0475882.zip
Merge commit 'b26b9425d700359d6ee68d45ac334fd1f2ab82d4' into remote
Conflicts: src/com/android/packageinstaller/permission/ui/handheld/GrantPermissionsViewHandlerImpl.java Change-Id: Ia57d17750406754f1e19266f51f0115e3cf774ba
Diffstat (limited to 'res/values-tr-watch')
0 files changed, 0 insertions, 0 deletions