am 98533cfa: am 88cd1a21: Merge "Upgrade to tzdata2012g."

* commit '98533cfa4b69d053e111e46bc74d8e9b2035a96e':
  Upgrade to tzdata2012g.