am af72df5b: am e75c273a: Merge "Track the tzdata2012g update in the new file format."

* commit 'af72df5b98944cfb89cecb7abc05bceec0612981':
  Track the tzdata2012g update in the new file format.