tree 03297e72990034032b882569fc20dc5cab96e2e4
parent 079b1a412e987ddeb13fa6631e69c227b0ecd290
parent b75ac5656e423b03e009f809d81dd04de2de6664
author Daniel Xie <dxie@google.com> 1444349651 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444349651 +0000

am b75ac565: am 8c894eed: am 58ca9e81: am 74b5e062: am f6a672c7: am b266f2c0: am fd2df146: am 917c8e09: am fe790a73: am 779c726a: Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev

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