ICU-13574 Merging trunk to branch

X-SVN-Rev: 40993

diff --cc icu4c/source/i18n/Makefile.in
index d05b907c368a32cfdbba2e9cafaa386c6684c762,e52be377e048e63a9109a89d5f93904498610a73..6bfbaed62cb5a87d0f66552091983c4e9198154d
--- 1/icu4c/source/i18n/Makefile.in
--- 2/icu4c/source/i18n/Makefile.in
+++ b/icu4c/source/i18n/Makefile.in
@@@ -108,9 -108,8 +108,11 @@@ number_decimfmtprops.o number_fluent.o 
  number_integerwidth.o number_longnames.o number_modifiers.o number_notation.o \
  number_padding.o number_patternmodifier.o number_patternstring.o \
  number_rounding.o number_scientific.o number_stringbuilder.o \
 -double-conversion-cached-powers.o double-conversion-diy-fp.o double-conversion-fast-dtoa.o
+ double-conversion.o double-conversion-bignum-dtoa.o double-conversion-bignum.o \
++double-conversion-cached-powers.o double-conversion-diy-fp.o double-conversion-fast-dtoa.o \
 +numparse_stringsegment.o numparse_unisets.o numparse_parsednumber.o \
 +numparse_impl.o numparse_symbols.o numparse_decimal.o numparse_scientific.o \
 +numparse_currency.o numparse_affixes.o numparse_compositions.o
  
  
  ## Header files to install

diff --cc icu4c/source/i18n/number_decimalquantity.cpp
Simple merge

diff --cc icu4c/source/i18n/number_decimalquantity.h
Simple merge

diff --cc icu4c/source/test/intltest/Makefile.in
index c67f0006caea0063980ef386c9b95ea1090b0484,e8a5b72b22d2aa60f4e133a519c03f42bd91ebdb..abdb68d7559e7534c2930b0023b8adce4882c6e2
--- 1/icu4c/source/test/intltest/Makefile.in
--- 2/icu4c/source/test/intltest/Makefile.in
+++ b/icu4c/source/test/intltest/Makefile.in
@@@ -64,8 -64,7 +64,8 @@@ scientificnumberformattertest.o datadri
  numberformattesttuple.o numberformat2test.o pluralmaptest.o \
  numbertest_affixutils.o numbertest_api.o numbertest_decimalquantity.o \
  numbertest_modifiers.o numbertest_patternmodifier.o numbertest_patternstring.o \
 -numbertest_stringbuilder.o numbertest_doubleconversion.o
 +numbertest_stringbuilder.o numbertest_stringsegment.o numbertest_unisets.o \
- numbertest_parse.o
++numbertest_parse.o numbertest_doubleconversion.o
  
  DEPS = $(OBJECTS:.o=.d)
  

diff --cc icu4c/source/test/intltest/numbertest.h
index 5d56dab20666c88edf0e2b1db64fa2e12e843eda,c1d5044761bf4abcca00e9b23635bbb17a776b8c..9ee15f4ece4021cc6a680e654569f70c532c791a
--- 1/icu4c/source/test/intltest/numbertest.h
--- 2/icu4c/source/test/intltest/numbertest.h
+++ b/icu4c/source/test/intltest/numbertest.h
@@@ -247,9 -215,7 +255,10 @@@ class NumberTest : public IntlTest 
          TESTCLASS(4, PatternModifierTest);
          TESTCLASS(5, PatternStringTest);
          TESTCLASS(6, NumberStringBuilderTest);
-         TESTCLASS(7, StringSegmentTest);
-         TESTCLASS(8, UniSetsTest);
-         TESTCLASS(9, NumberParserTest);
+         TESTCLASS(7, DoubleConversionTest);
++        TESTCLASS(8, StringSegmentTest);
++        TESTCLASS(9, UniSetsTest);
++        TESTCLASS(10, NumberParserTest);
          default: name = ""; break; // needed to end loop
          }
      }