tree 03297e72990034032b882569fc20dc5cab96e2e4
parent ef93e2f34a0ad920d8d3b35d2afa5ac281c1eed8
parent 3ee1e2acaa4c41cd76ddc04a34a921851c31ccbf
author Daniel Xie <dxie@google.com> 1444349290 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444349290 +0000

am 3ee1e2ac: am ab44963a: am 7999eb24: am 904fb41d: am 0e5d0c76: am 9551a862: am 97a16d1a: am afc1b34a: am 1d1abc5b: Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts-dev

* commit '3ee1e2acaa4c41cd76ddc04a34a921851c31ccbf':
  Fix TimeZoneTest#testPreHistoricOffsets CTS failures.