commit 6bada87e49f7f6ad9bfb54521f880e63a5f0f3c2
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 25 21:12:30 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 25 21:12:30 2022 +0000
tree bbb10369d1280c7065f323b36254943e3f6854c1
parent b2f99cd4f24d28bc459872fa89466fa078f0f90a
parent c771ae3b04c87c466f0336e67666e51f89a0cba5

[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: c771ae3b04 -s ours

am skip reason: subject contains skip directive

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

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