tree b46917528146f819f1dcec2096ba897449f7ddff
parent d339d873218938992f25744d79cac58ced45674a
parent ee70e711e1ec9afe710a7d2fb5a742f64a68f38a
author Almaz Mingaleev <mingaleev@google.com> 1650533011 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650533011 +0000

[automerger skipped] Merge "DO NOT MERGE Ignore tztest#TestCanonicalID [S CTS]." into android12-tests-dev am: d49a15823a -s ours am: 0a5d5f6a75 -s ours am: ee70e711e1 -s ours

am skip reason: subject contains skip directive

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

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