Merge "Use ICU in libandroidicu"
am: c42df058d9

Change-Id: I1e5e17ce7437466af46fe94d819328e4a8d6be19
tree: 2d56630aac8a2b8a5ea67f632556d4c367b12380
  1. service/
  2. PREUPLOAD.cfg