Starbucks and Ethiopian government officials announced Thursday that they had reached an agreement “in principle” to resolve their longstanding dispute over Ethiopia’s attempts to trademark and license its regional coffee names.

Arnold & Porter partners Robert Winter and Roberta Horton and counsel Anna Manville have been advising the Ethiopian government pro bono on its efforts to protect those coffee names.