tree fab690fdde9c1afa49bd1729545500b56d0abac4
parent 6eabe298922175ab7385e01250804e4084ff80e9
parent 421a855a1fda5d550ff00765c219a8128b63cf0f
author Almaz Mingaleev <mingaleev@google.com> 1661441805 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1661441805 +0000

[automerger skipped] DO NOT MERGE Ignore TimeZoneTest#TestCanonicalID [O-MR1 CTS]. am: 671bae87b1 -s ours am: b5ddab3dc8 -s ours am: 770bacb308 -s ours am: 641285c7f1 -s ours am: e44bee4b70 -s ours am: 51a92fbaf9 -s ours am: 8992a0f95e -s ours am: 421a855a1f -s ours

am skip reason: subject contains skip directive

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

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