ICU-13634 Merging trunk to branch

X-SVN-Rev: 41176

diff --cc icu4c/source/i18n/Makefile.in
index 95ec314cdf634b3866751d104aef2cab26e07880,ab8cc93c8b3a9309e93a2d339675b678267bb235..eaa5d0683ee09afc86cb249cff44f427984d38e5
--- 1/icu4c/source/i18n/Makefile.in
--- 2/icu4c/source/i18n/Makefile.in
+++ b/icu4c/source/i18n/Makefile.in
@@@ -104,11 -109,8 +104,12 @@@ number_integerwidth.o number_longnames.
  number_padding.o number_patternmodifier.o number_patternstring.o \
  number_rounding.o number_scientific.o number_stringbuilder.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 \
+ double-conversion-cached-powers.o double-conversion-diy-fp.o \
 -double-conversion-fast-dtoa.o double-conversion-strtod.o
++double-conversion-fast-dtoa.o double-conversion-strtod.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 numparse_validators.o \
 +number_mapper.o number_multiplier.o number_currencysymbols.o number_skeletons.o number_capi.o \
  
  
  ## Header files to install

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

diff --cc icu4c/source/test/intltest/numbertest.h
Simple merge

diff --cc icu4j/main/classes/core/src/com/ibm/icu/impl/number/DecimalQuantity_AbstractBCD.java
Simple merge