beremiz

merge

18 months ago, Edouard Tisserant
bafb3f25d5bd
merge
/**
* No platform specific code for "Generic" target
**/