My friend kissed my cheek...?

Of course we usually kiss when we say hi, but today we had a really hard exam for which I couldn't study too well. I was so nervous I was a little bit nauseous, and when we saw each other I told him how scared I felt. He laughed and I pouted at him. He laughed once more and kissed my cheek, saying "one for hello", and then kissed me once more and said "and one to calm you down". This obviously did not calm me down and it made me flustered. I consider it a friendly action, but my other friend (who was also there and saw this) thinks it's because he saw the situation as an opportunity to kiss me fully on the cheek. Which one is it?