aboutsummaryrefslogtreecommitdiff
path: root/mediapicker/src/main/res
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-10-13 23:42:57 -0400
committerAllan Wang <me@allanwang.ca>2017-10-13 23:42:57 -0400
commitafc1a0261985dcf8e7d73255c291098af1fdc966 (patch)
tree5fad06062bf746b14f807e619d011cf41d83cf59 /mediapicker/src/main/res
parent1edb6e1ac1297f6feb229d8f89e07a88de1ae2e9 (diff)
parenta0b35316f7bb6014ebbd3e18be870e860b30ea71 (diff)
downloadkau-afc1a0261985dcf8e7d73255c291098af1fdc966.tar.gz
kau-afc1a0261985dcf8e7d73255c291098af1fdc966.tar.bz2
kau-afc1a0261985dcf8e7d73255c291098af1fdc966.zip
Merge dev3.4.4
Diffstat (limited to 'mediapicker/src/main/res')
-rw-r--r--mediapicker/src/main/res/values/strings_mediapicker.xml (renamed from mediapicker/src/main/res/values/strings.xml)0
1 files changed, 0 insertions, 0 deletions
diff --git a/mediapicker/src/main/res/values/strings.xml b/mediapicker/src/main/res/values/strings_mediapicker.xml
index 717e12b..717e12b 100644
--- a/mediapicker/src/main/res/values/strings.xml
+++ b/mediapicker/src/main/res/values/strings_mediapicker.xml