tree 1f5e91f46cd9d1d9361b8463e078222855c61094
parent 233050b15ec3ce0db534ec6cc24a6061559993d2
parent ff145277da9b7fe3d48a27839fc1d6f2ed11604b
author Elliott Hughes <enh@google.com> 1373320541 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1373320541 -0700

am ff145277: Merge "Upgrade to tzdata2013d."

* commit 'ff145277da9b7fe3d48a27839fc1d6f2ed11604b':
  Upgrade to tzdata2013d.