Merge commit 'b10036b39003b6961c57f87f65236c1d5d0d1e52' into eclair-mr2-plus-aosp * commit 'b10036b39003b6961c57f87f65236c1d5d0d1e52': Add "deleted" row to Events table.
Merge commit 'b10036b39003b6961c57f87f65236c1d5d0d1e52' into eclair-mr2-plus-aosp * commit 'b10036b39003b6961c57f87f65236c1d5d0d1e52': Add "deleted" row to Events table.