Tokyo Skyline Panorama from Roppongi Tower
This is just a two shot pano taken from Roppongi Hills. Both Tokyo Tower and Tokyo Sky Tree are visible. To the right of the picture is the Tokyo Gate Bridge and Rainbow Bridge.
As a side note, the views from Roppongi Tower and Tokyo Tower are much better than those from the Sky Tree, especially at night, as both are closer to the centre of Tokyo and, as such, all the interesting sights are much nearer. Also, you don't have to line up forever! :)