summaryrefslogtreecommitdiffstats
path: root/res/values-iw
diff options
context:
space:
mode:
authorLalit Kansara <lkansara@codeaurora.org>2016-12-06 15:04:06 +0530
committerLalit Kansara <lkansara@codeaurora.org>2016-12-06 15:04:06 +0530
commit987a4addffc6d7935a0e14f9a4cb11dd89e74e4c (patch)
treec19b111aef28a52efc0147ef2bcd56dc423cc4b6 /res/values-iw
parentec4077e1d04f28b72f69ad703b21cab9abf73282 (diff)
parenta6db712a32f86a79bc80873832c438de439b5645 (diff)
downloadandroid_packages_providers_DownloadProvider-987a4addffc6d7935a0e14f9a4cb11dd89e74e4c.tar.gz
android_packages_providers_DownloadProvider-987a4addffc6d7935a0e14f9a4cb11dd89e74e4c.tar.bz2
android_packages_providers_DownloadProvider-987a4addffc6d7935a0e14f9a4cb11dd89e74e4c.zip
Merge commit 'a6db712a32f86a79bc80873832c438de439b5645' into remote
Conflicts: src/com/android/providers/downloads/DownloadProvider.java Change-Id: Ibc0a0d79a9a5e9127d181491537e62b2d78067a7
Diffstat (limited to 'res/values-iw')
0 files changed, 0 insertions, 0 deletions