Samsung-Microsoft Contract dispute settled