diff options
| author | ylecollen <ylecollen@amdocs.com> | 2017-01-10 14:45:30 +0100 |
|---|---|---|
| committer | ylecollen <ylecollen@amdocs.com> | 2017-01-10 14:45:30 +0100 |
| commit | 8ea5bc7960a31ba42abeeae9f0cab4ffb1319987 (patch) | |
| tree | d113471edd8f66c65f7423ed7ddbf1e93932c12d /android/olm-sdk/src/main/jni/olm_manager.cpp | |
| parent | 03ae28e0873486649421b9428c4407851a89241c (diff) | |
| parent | 4323bec5d6e71fdb38d88ea4f68cf6923092bcc2 (diff) | |
Merge remote-tracking branch 'origin/pedroc/android_e2e_dev' into pedroc/android_e2e_dev
Diffstat (limited to 'android/olm-sdk/src/main/jni/olm_manager.cpp')
0 files changed, 0 insertions, 0 deletions