ICU-13177 Merging trunk to branch

author Shane Carr <shane@unicode.org>

Fri, 12 May 2017 22:22:09 +0000 (22:22 +0000)

committer Shane Carr <shane@unicode.org>

Fri, 12 May 2017 22:22:09 +0000 (22:22 +0000)
author Shane Carr <shane@unicode.org>
Fri, 12 May 2017 22:22:09 +0000 (22:22 +0000)
committer Shane Carr <shane@unicode.org>
Fri, 12 May 2017 22:22:09 +0000 (22:22 +0000)
diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/number/Parse.java
Simple merge
diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/number/formatters/CompactDecimalFormat.java
Simple merge
diff --cc icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
Simple merge
author	Shane Carr <shane@unicode.org>
	Fri, 12 May 2017 22:22:09 +0000 (22:22 +0000)
committer	Shane Carr <shane@unicode.org>
	Fri, 12 May 2017 22:22:09 +0000 (22:22 +0000)
		1	2
icu4j/main/classes/core/src/com/ibm/icu/impl/number/Parse.java	patch \|	diff1 \|	diff2 \|	blob \| history
icu4j/main/classes/core/src/com/ibm/icu/impl/number/formatters/CompactDecimalFormat.java	patch \|	diff1 \|	diff2 \|	blob \| history
icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java	patch \|	diff1 \|	diff2 \|	blob \| history