After a long-standing rivalry between the two companies, it appears they’ve reached an agreement.
Source: CNet