tree d4906e121dbd09d4b71c9039c6371cdf55f8bceb
parent f08c02a9e1ed5c9f40c757a8dbe702326c393bb4
parent 2285458518d6068ad0947e938d3394521aefe03b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579621487 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579621487 +0000

[automerger skipped] Revert "Hide temporarily 4 ICU fields to avoid merge conflicts in downstream branches" am: ecdb11822c am: 79f2c25bbc am: 2285458518 -s ours
am skip reason: Change-Id Idb323a91565d1dc612d4f16439ce84eb18a2dbd7 with SHA-1 f08c02a9e1 is in history

Change-Id: Ia62731f441eecff5d13f2656da63b3d989185921