tree 1d9b0bf1b3fdd71b837b31ab68622594e2da5e1d
parent 4f4926f9a01be2af09c2f099b268b0ac81d2de9f
parent 595d8fad1388f1a9ad6f6a278e8e5832b7d7ab75
author Almaz Mingaleev <mingaleev@google.com> 1661445568 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1661445568 +0000

[automerger skipped] DO NOT MERGE Ignore tztest#TestCanonicalID [O-MR1 CTS]. am: d256b16cea -s ours am: 3789702283 -s ours am: 197502b3a1 -s ours am: 037af050c1 -s ours am: 9911b43968 -s ours am: 56f8b30dcb -s ours am: a255774093 -s ours am: e871e9d663 -s ours am: 9efb63baf6 -s ours am: ddb2c9a2c9 -s ours am: 595d8fad13 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/external/icu/+/2096341

Change-Id: I28221718e2a66119490bed8da2afbc2576838d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>