The deal was announced after days of speculation over where the unique, two-way star would continue his career after six seasons with the Los Angeles Angels.
The International Olympic Committee says that qualifying athletes from the two countries will be allowed to compete in the Paris Games as "Individual Neutral Athletes."