Commit 42e18bd0c2081cdbe342d13f273fe5708cb3e079

Sylvain Becker 2019-01-11T14:25:32

Android: fix bad merge from previous commit