tree 2b16427b930059f91b71f33b50b4a9b46d7ebca4
parent cd834618c4752b61d54ff4005a8baa8219b822e4
parent b88f810d585a1736a1759c2c22e9f4999441ae00
author Elliott Hughes <enh@google.com> 1333408066 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333408066 -0700

am b88f810d: Merge "Update to tzdata2012c."

* commit 'b88f810d585a1736a1759c2c22e9f4999441ae00':
  Update to tzdata2012c.