tree 27c1adf71d4a8a72a5c03178c9d604199fd25913
parent 8a061e3716fa22a666dc05f6b748425a00f285c0
parent 70f13bc16319dd7a2a437f45c3845b88a9f39de4
author Elliott Hughes <enh@google.com> 1376442130 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376442130 -0700

am 70f13bc1: Merge "Move to the unadulterated icu data."

* commit '70f13bc16319dd7a2a437f45c3845b88a9f39de4':
  Move to the unadulterated icu data.