tree 67b635e1439a0c102af12c99e15fb90c6f07e2f9
parent afc1b34aca91144c80dfa7a46f52874fd8df3a31
parent 779c726a7a24ae169cefacf2aa91cc54139a96ec
author Daniel Xie <dxie@google.com> 1444346308 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444346308 +0000

am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev

* commit '779c726a7a24ae169cefacf2aa91cc54139a96ec':
  Fixes associated with the tzdata 2015a update