beremiz

merged Sergeys changes

2018-03-02, Edouard Tisserant
cc7a46953471
merged Sergeys changes
/**
* No platform specific code for "Generic" target
**/