tree 45e587e11e2fb53fb056972a0311fed07e96f527
parent c1f7fd9d7d4bc8d6779881d6a2797410842a6269
parent 6b2f23f11ecb2a3af71fa556206589f2cf413064
author Elliott Hughes <enh@google.com> 1401379946 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401379946 +0000

am 6b2f23f1: Merge "Upgrade icu4c to tzdata2014d."

* commit '6b2f23f11ecb2a3af71fa556206589f2cf413064':
  Upgrade icu4c to tzdata2014d.