The parties filed a joint dismissal motion in federal court in California, ending a dispute that was scheduled to go to trial ...