tree c6623b17e701c2b825fd7220db67febd0eb56a0d
parent bc61819a90a8af888f9c8fccd24d9ebe9c4642b4
parent a64371fec4ccf3e3a6f4db8f638664a55d2c02b2
author Fredrik Roubert <fredrik@roubert.name> 1512163441 +0000
committer android-build-merger <android-build-merger@google.com> 1512163441 +0000

Merge "Cherry-pick: Switch from ICU deprecated unorm_normalize to unorm2_normalize." am: 776a18aff2 am: 23040ff2d2
am: a64371fec4

Change-Id: Iddaa8212e512f992f57347f990a36caf57b064d1