tree 6d8a4a0c1e23538a70532aa6874c026a2dbe88f7
parent 33d6adcebbac541a803a08013db15a84e4b82bcf
parent 261822541bc23754c4ebe784895230bb3c0e752a
author vichang <vichang@google.com> 1546982427 -0800
committer android-build-merger <android-build-merger@google.com> 1546982427 -0800

[automerger skipped] Merge "Use ICU in libandroidicu" am: 851a571c58 am: d80c35a12d
am: 261822541b -s ours
am skip reason: change_id Ida6aac85dfb79bf8e7a3a2540e567ee211279e09 with SHA1 b6826d9e88 is in history

Change-Id: I25970934124d2c58fdce059850edaa21ad19854b