tree c6623b17e701c2b825fd7220db67febd0eb56a0d
parent 7e52a7146d13ba083cc0122bb14fc1ac729f4f57
parent 23040ff2d2cc40bdb4332b6dc2333194e07207c9
author Fredrik Roubert <fredrik@roubert.name> 1512162025 +0000
committer android-build-merger <android-build-merger@google.com> 1512162025 +0000

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

Change-Id: Iac43a41d19078ea6f11fd41133259d73a60763cf