Owner of San Antonio’s Hotel Emma ends trademark infringement suit against Austin apartment developer  San Antonio Express-News