The standoff is over. Today, American and Expedia announced a distribution agreement that will once again allow American fares to appear in Expedia flight search results. The move takes place immediately.
The two parties made big news earlier in the year when Expedia stopped selling American flights in a dispute over distribution methods.
I can't see any reason to rehash it all again here, but if you're interested in the background, regular Today in Travel blogger Carl Unger summarized it nicely in early January.