am 01484957: (-s ours) Merge change 21634 into eclair
Merge commit '014849570c80ce2c7081f8477ac97dcebabc4f5c' * commit '014849570c80ce2c7081f8477ac97dcebabc4f5c': Add new calendar database columns; do not merge (cherry-picked 1fa64)
This commit is contained in: