3df3bfcbad6f4da20964424c4772985d1b1586a1 - SHIFTPHONES/android_libcore

commit	3df3bfcbad6f4da20964424c4772985d1b1586a1	[log] [tgz]
author	Rayhaan Jaufeerally <rayhaan@google.com>	Wed Aug 26 19:54:48 2015 +0100
committer	Rayhaan Jaufeerally <rayhaan@google.com>	Thu Aug 27 08:44:47 2015 +0100
tree	1cb5c169a483ca55c1c474cb09894f4330dfb855
parent	2898abc18021b942fcd8b8ffdb20af8cd8bbf8a5 [diff]

Revert "Revert "Migrate Collator classes to use ICU4J.""

The SDK build is now fixed by adding icu4j as a dependency of docs.

This reverts commit 5fc822e7ef47448adccd73ca2ebbd28a068f5136.

Change-Id: Ibac9b40189a83323e5175e8ea26c973eb07bc34f

JavaLibrary.mk[diff]
benchmarks/src/benchmarks/regression/CollatorBenchmark.java[Added - diff]
harmony-tests/src/test/java/org/apache/harmony/tests/java/text/CollationElementIteratorTest.java[diff]
harmony-tests/src/test/java/org/apache/harmony/tests/java/text/RuleBasedCollatorTest.java[diff]
luni/src/main/java/java/text/CollationElementIterator.java[diff]
luni/src/main/java/java/text/Collator.java[diff]
luni/src/main/java/java/text/RuleBasedCollator.java[diff]
luni/src/main/java/libcore/icu/CollationElementIteratorICU.java[Deleted - diff]
luni/src/main/java/libcore/icu/CollationKeyICU.java[diff]
luni/src/main/java/libcore/icu/NativeCollation.java[Deleted - diff]
luni/src/main/java/libcore/icu/RuleBasedCollatorICU.java[Deleted - diff]
luni/src/main/native/Register.cpp[diff]
luni/src/main/native/libcore_icu_NativeCollation.cpp[Deleted - diff]
luni/src/main/native/sub.mk[diff]
luni/src/test/java/libcore/java/text/CollatorTest.java[diff]

15 files changed

tree: 1cb5c169a483ca55c1c474cb09894f4330dfb855