am c6f15ecf: am 1510795f: Merge "Upgrade to tzdata2012e."

* commit 'c6f15ecf76842801db653d58a262c7d342be2a93':
  Upgrade to tzdata2012e.