No visa needed if you are connecting in from one country and heading to a third country. You can stay for up to 48 hours with no visa at all. I just flew ORD-PVG-FUK on AA and JL and had no problems at all.. spent two evenings down on the Bund!

Airline employees are somewhat skeptical of this new no visa transit thing but if they dig deep enough in Timatic (which you can access yourself in real time on delta.com of all places at http://www.delta.com/planning_reserv...tion/index.jsp