US-Japan-China-US. Do I still qualify for the 72hr free transit if I am in Japan for so little time?

My first arrival city is Tokyo and I am there less then 24hrs prior to flying onto Shanghai. Then I am in Shanghai for less then 72hrs before my flight back to the U.S.