tree 7f6a30302e3864ce72912a9c3611150d83d61a39
parent 891397db69f8259ac83a76391cab28fb77ee5eb4
parent b8fcb81f03613bd18c6a64ff17ef01f17dbe3c57
author Neil Fuller <nfuller@google.com> 1441359916 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441359916 +0000

am b8fcb81f: Merge "Revert "Revert "Migrate Collator classes to use ICU4J."""

* commit 'b8fcb81f03613bd18c6a64ff17ef01f17dbe3c57':
  Revert "Revert "Migrate Collator classes to use ICU4J.""