commit 422cc690b78b80289e1bfd7136ca47174e744743
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 25 00:21:18 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 25 00:21:18 2022 +0000
tree 147ba52c44cb9cba0835ebd0a7b980e9cfb6d6c1
parent d25babbcb61af58269be32b5c756690a69a7adee
parent a9c2107fee511071c2ac20096da21f5149555ce1

[automerger skipped] Merge "DO NOT MERGE Track TZDB 2022a rev. 2 changes. [O-MR1 CTS]" into oreo-mr1-cts-dev am: c44612b872 -s ours am: fb7b265b8a -s ours am: 3ab951b642 -s ours am: 0fa08ed68b -s ours am: 4ad86ea4ed -s ours am: 2bfb332fe6 -s ours am: 0b4cf135e7 -s ours am: a9c2107fee -s ours

am skip reason: subject contains skip directive

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

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