am c7fda6a9: am d4623e56: am b338ea30: Merge "Upgrade to tzdata2012f."

* commit 'c7fda6a96daeb6d089f3d8f4426b6fc211017289':
  Upgrade to tzdata2012f.