IS a Transit Visa needed?

I am a US citizen visiting Japan and Shanghai. I am going to fly out of Atlanta to Tokyo and Osaka for 4 days. I take a flight from Osaka to Shanghai. I am there for under 72 hrs visiting my friends. Then take a flight back to Atlanta via Tokyo. I will be in Tokyo for about 20 hrs. Can I get a transit visa for China?