The trailer was after the credits, which they sometimes do when it gives away something from the cliffhanger. (or they are doing it with every episode this season, as it used to be before the credits)
I didn't see anything in the trailer to spoil how it happened. (I might have missed it though... but I'm not going to rewatch the trailer to find out. )