ICU-13574 Merging trunk to branch

author Shane Carr <shane@unicode.org>

Tue, 13 Feb 2018 18:36:45 +0000 (18:36 +0000)

committer Shane Carr <shane@unicode.org>

Tue, 13 Feb 2018 18:36:45 +0000 (18:36 +0000)
author Shane Carr <shane@unicode.org>
Tue, 13 Feb 2018 18:36:45 +0000 (18:36 +0000)
committer Shane Carr <shane@unicode.org>
Tue, 13 Feb 2018 18:36:45 +0000 (18:36 +0000)
diff --cc icu4c/source/i18n/number_grouping.cpp
Simple merge
diff --cc icu4c/source/i18n/unicode/numberformatter.h
Simple merge
diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java
Simple merge
diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/StringSegment.java
Simple merge
author	Shane Carr <shane@unicode.org>
	Tue, 13 Feb 2018 18:36:45 +0000 (18:36 +0000)
committer	Shane Carr <shane@unicode.org>
	Tue, 13 Feb 2018 18:36:45 +0000 (18:36 +0000)
		1	2
icu4c/source/i18n/number_grouping.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
icu4c/source/i18n/unicode/numberformatter.h	patch \|	diff1 \|	diff2 \|	blob \| history
icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/NumberParserImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history
icu4j/main/classes/core/src/com/ibm/icu/impl/number/parse/StringSegment.java	patch \|	diff1 \|	diff2 \|	blob \| history