tree 8d1e797846967bee97bf22fe60f438306081aa40
parent 06abe13c5f7a318eef316268d0d25d92ff128c19
parent 32ea9fe5783e3cc9756205c0ac46482afc700a3d
author Elliott Hughes <enh@google.com> 1350515371 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350515371 -0700

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

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