commit 25acc515947833ec0b22dc32da77e735f111c5e2
author Almaz Mingaleev <mingaleev@google.com> Thu Aug 25 16:04:47 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 25 16:04:47 2022 +0000
tree 123d9a48853401e3274e8842df926dd8d4e93eaf
parent 8b53435086d433c742eeaf7a59254e0999279e79
parent 6eabe298922175ab7385e01250804e4084ff80e9

[automerger skipped] DO NOT MERGE Ignore tztest#TestCanonicalID [O-MR1 CTS]. am: d256b16cea -s ours am: 442e3f012c -s ours am: 4fc00d7e60 -s ours am: a896504cce -s ours am: f40bfb15c0 -s ours am: c0cb231076 -s ours am: 5c090964b4 -s ours am: 83f6aab177 -s ours am: 6eabe29892 -s ours

am skip reason: subject contains skip directive

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

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