I updated my phone via "AT&T software update". If that's what you're talking about, then yes. Both have been updated this way.
"Did you get the update over the air? In other words, did you get a prompt on the phone that an update was available and you chose to allow the update?"
yes. I checked through AT&T software update and it asked if I wanted to update(which I did).