Both happened, but 1/2 to 2/3 of the difference is due to actual efficiency gains.

Source: recently read The Quest, book which discusses energy in the modern world