tree 1b9cca13108d197c7cd87c7bca0d7c481ad512a0
parent e5c8ced4f95e97b2fadc0c64fbdbeeb023677035
parent 5ae762a393168932602eb7269a7d30a53de1c83c
author Elliott Hughes <enh@google.com> 1350583167 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350583167 -0700

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

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