It seems as though Microsoft and Samsung were doing more than just settling a patent dispute last month.
The partners were outlining a new generation of agreements. The first fruits of this showed up in Barcelona as Samsung’s Galaxy S6 arrived with Microsoft’s OneNote, OneDrive and Skype pre-installed. On Monday, the two companies announced that Microsoft’s services will be coming to select Android tablets from Samsung as well, starting in the coming months.
Samsung will also start selling Microsoft’s Office 365 service in conjunction with its own Knox security product.
“Great things happen when you converge services and devices,” Microsoft Executive VP Peggy Johnson said in a statement. “Our partnership with Samsung is emblematic of our efforts to bring the best of Microsoft’s productivity services to everyone, on every device — so people can be productive wherever, however and whenever they want.”
Microsoft had sued Samsung last year, saying the Korean electronics giant had been slow to pay Microsoft patent royalties it was owed over Samsung’s Android use.
This article originally appeared on Recode.net.