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

Merge commit 'b10036b39003b6961c57f87f65236c1d5d0d1e52' into eclair-mr2-plus-aosp

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base