am 2a5232dd: Merge change 27334 into eclair

Merge commit '2a5232ddf4c073b8cdaac7884624d0f6f207ef9e' into eclair-plus-aosp

* commit '2a5232ddf4c073b8cdaac7884624d0f6f207ef9e':
  make EventInfoActivity handle hasAttendeeData.