Merge "Don't use ICU when built for vendors" am: fc6bb57693
am: ed6a0cb1f1

Change-Id: Ic488129f7d38fd5a337f3d4bcb419ffc6660a7ae
tree: deaa5e2923ecc77df80d9487af179d9888dc5487
  1. android/
  2. dist/
  3. Android.bp
  4. CleanSpec.mk
  5. OWNERS
  6. README.version