am 947c45b2: am b10036b3: Merge change Iaa321588 into eclair-mr2

Merge commit '947c45b29586b64c358b7824881d98faa8733ba8'

* commit '947c45b29586b64c358b7824881d98faa8733ba8':
  Add "deleted" row to Events table.