diff options
author | Richard van der Hoff <richard@matrix.org> | 2016-07-06 22:33:14 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2016-07-06 22:33:14 +0100 |
commit | f2151c02874efbb3976282f4c79663b9b186fcc7 (patch) | |
tree | fe3d70e7a7d25bdd732ccb079ab1e1729e4fbc40 /java/android/OlmLibSdk/olm-sdk/src/main/AndroidManifest.xml | |
parent | c8d00665b37af44e1c62b56407ed8e2e84fee830 (diff) | |
parent | 939aa747dd64bdfb3b2138ffccd4792c18f6ab91 (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