The two sides met today over whether or not Aubry would resume visitation of his four-year-old daughter with Berry, Nahla.
Berry's attorney Blair Berk and Aubry's attorney Shawn Chapman Holley confirmed to ET that "the parties have reached an amicable agreement. There will be no further statements regarding this matter."
Last week, according to police sources, a fight broke out when Aubry was dropping off Nahla to Berry's house for Thanksgiving.
The next day, Aubry was granted a temporary restraining order against Martinez.
"At no time during the altercation with Mr. Martinez was I the aggressor," wrote Aubry at the time that he was petitioning for the restraining order, prior to this new agreement. "I fear for my physical safety if I am in the presence of Mr. Martinez."
They Dated?! Surprising Celebrity Hookups
Star Sightings: Celebrity Candids
Are These Celebs Too Tan?! Cast Your Vote!