After their fallout over Aishwarya Rai, Salman Khan and Vivek Oberoi shared a stage at an award show, but tension was clear as both avoided each other.