merge android branch (specs)
authorNiki Roo <niki@nikiroo.be>
Sat, 18 May 2019 16:20:34 +0000 (18:20 +0200)
committerNiki Roo <niki@nikiroo.be>
Sat, 18 May 2019 16:20:34 +0000 (18:20 +0200)
commit1feb447473d8176c3a218cc209c681fb41d468d1
treedf0d3e58715b1324a8ad16cc5de95441d32e6100
parent46c80ba21135a75da8dc31dc563157c342728ea2
parent9978a56a375a8f6f456f0bfc7d1124d9281eea49
merge android branch (specs)