am c2e4c310: am 32ea9fe5: Merge "Put all the tzdata in one file."

* commit 'c2e4c310ff9ace06be0376d649a09abb51813981':
  Put all the tzdata in one file.