Oliver Woodman deb9b301b2 Merge branch 'dev-v2-r2.5.0' into release-v2

2017-08-07 14:33:22 +01:00

..

androidTest

Clean-up manifest merge attributes.

2017-06-06 16:38:45 +01:00

main

Merge branch 'dev-v2-r2.5.0' into release-v2

2017-08-07 14:33:22 +01:00