commit c771ae3b04c87c466f0336e67666e51f89a0cba5
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 25 20:52:06 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 25 20:52:06 2022 +0000
tree bbb10369d1280c7065f323b36254943e3f6854c1
parent 8fa34b301bcde55858f8ea1998add72279a70855
parent 9b9caa1061694d3d98805c2f3b6c82b19f92fa6a

[automerger skipped] Merge "DO NOT MERGE Track TZDB 2022a rev. 2 changes. [P CTS]" into pie-cts-dev am: daec95f11d -s ours am: e49b9117e1 -s ours am: eb10b33180 -s ours am: cc8e58a59f -s ours am: 8872c12826 -s ours am: cee71a75c9 -s ours am: f6c675b8b6 -s ours am: 9d05d59307 -s ours am: 9b9caa1061 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/libcore/+/2194740

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