Canon Announces Resolution of Patent Infringement Dispute