tree 8d68add6960e5997b19690aa36a49339c2b90d32
parent 9648b588b410a052fb0fff0c40b1d27320c86ce1
parent 1b315363c22fdf53d77fc83ec0bbada32e73ccc7
author Elliott Hughes <enh@google.com> 1350583321 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350583321 -0700

am 1b315363: am 5ae762a3: Merge "Pull bionic\'s time zone data from the new single \'tzdata\' file."

* commit '1b315363c22fdf53d77fc83ec0bbada32e73ccc7':
  Pull bionic's time zone data from the new single 'tzdata' file.