aboutsummaryrefslogtreecommitdiff
path: root/java/android/OlmLibSdk/olm-sdk/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-07-06 22:33:14 +0100
committerRichard van der Hoff <richard@matrix.org>2016-07-06 22:33:14 +0100
commitf2151c02874efbb3976282f4c79663b9b186fcc7 (patch)
treefe3d70e7a7d25bdd732ccb079ab1e1729e4fbc40 /java/android/OlmLibSdk/olm-sdk/src/main/AndroidManifest.xml
parentc8d00665b37af44e1c62b56407ed8e2e84fee830 (diff)
parent939aa747dd64bdfb3b2138ffccd4792c18f6ab91 (diff)
Merge branch 'rav/fix_decrypt_utf8'
Diffstat (limited to 'java/android/OlmLibSdk/olm-sdk/src/main/AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions