tree f97dfdf32f74cedda8e15e80ad5162765f96e51f
parent 197818f1ddf55947bfd8b69b398b06caa702e00b
parent 8a78a97c715df5bc0b35f6ff454c1180875a355b
author Neil Fuller <nfuller@google.com> 1400156274 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400156274 +0000

am 8a78a97c: Merge "Removing data hacks from ICU root.txt"

* commit '8a78a97c715df5bc0b35f6ff454c1180875a355b':
  Removing data hacks from ICU root.txt