I don't know for sure, but I'm pretty sure we did, if only because I haven't seen Ling here anywhere and I don't think I would have left him behind. And I don't think I would have traded being trapped for being trapped.
Mm, maybe one of my next memories will show me how we got out...