am 7e011e58: (-s ours) am fe3a17f2: Merge "Make edit event use the home tz. Do not merge" into gingerbread

Merge commit '7e011e5818b3f325836a617d395025b8eed91b83'

* commit '7e011e5818b3f325836a617d395025b8eed91b83':
  Make edit event use the home tz. Do not merge