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)

Trivial merge