commit d175f0ccd74f79c6d9f8db377bcc9514a9474e77
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 25 20:01:47 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 25 20:01:47 2022 +0000
tree b97d703b79aa2d0d0e3edf85e0e0948fbe8578df
parent c3f689c22242917d5fee451c8df0315c1f7c7d7d
parent f6c675b8b6814b7ad269c426fd747243759f4c1d

[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 skip reason: subject contains skip directive

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

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