tree 6770798b4a4f67f62a5450ac91c94dc8f51a197a
parent 7999eb24b4c6004eb61a73b1fa3306ffd1ca4154
parent f6a672c74ffa7322c19e9436cd9b92f981e35d84
author Daniel Xie <dxie@google.com> 1444348382 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444348382 +0000

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 'f6a672c74ffa7322c19e9436cd9b92f981e35d84':
  Fixes associated with the tzdata 2015a update