tree b8bae78bd30e8a80278968c232d722dd13cba2c7
parent e6a2d3b41720a35ea9c85cf554b504e9c033b46f
parent d722d2918271fb2a6658680dd4e74fb5d36324cc
author Neil Fuller <nfuller@google.com> 1561979691 -0700
committer android-build-merger <android-build-merger@google.com> 1561979691 -0700

[automerger skipped] Merge "Switch host variant to using ICU direct" am: 73f136ec94 am: dfe26cd03a -s ours
am: d722d29182 -s ours
am skip reason: change_id I55ff16556c2bd6f2d12b6cd39d732649b03be9c1 with SHA1 f59d42e557 is in history

Change-Id: Ib37426b1decce8d933377ff07f2702adf0ef8a4f