Commit e0fb2a88 authored by cyberta's avatar cyberta

Merge branch 'androidx' into 'master'

Androidx

See merge request !103
parents 05205190 cea55aaa
Pipeline #36034 passed with stages
in 24 minutes and 54 seconds