am 21736ffd: Merge change If80d9ab9 into eclair

Merge commit '21736ffd1e795edd6ea64955bafbd245dc8ba355' into eclair-plus-aosp

* commit '21736ffd1e795edd6ea64955bafbd245dc8ba355':
  use Events for birthdays