am 990a6879: DO NOT MERGE Fix testCalendarSerialization
Brian Muramatsu authored
* commit '990a6879':
  DO NOT MERGE Fix testCalendarSerialization
3063cb8a