tree bef9bbcc8c412927e30b4dd55323362ce886e939
parent 4e362f230b36596650feaa305bdf5f6af7b634f8
parent fdb119297ac421e2fc2ec096a6d5370b81938de8
author Elliott Hughes <enh@google.com> 1333408176 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333408176 -0700

am fdb11929: am b88f810d: Merge "Update to tzdata2012c."

* commit 'fdb119297ac421e2fc2ec096a6d5370b81938de8':
  Update to tzdata2012c.