commit 588af03b404ef135b83ef5baf840cb469c40f98c
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 25 20:52:18 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 25 20:52:18 2022 +0000
tree bbb10369d1280c7065f323b36254943e3f6854c1
parent 2ff89f2568163462eb812ae69a335668b6bd8b21
parent 662f69b9564fd07c76fccac838c823083683a6ca

[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: d175f0ccd7 -s ours am: 4c20fc6e23 -s ours am: 662f69b956 -s ours

am skip reason: subject contains skip directive

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

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