commit 6e8034bac4df5f1419d198c9d375c81e63da41bb
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 25 01:05:30 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 25 01:05:30 2022 +0000
tree bbb10369d1280c7065f323b36254943e3f6854c1
parent aeb9aba5e5c187646992c327fe43ceff99e70151
parent c7853827a482803e6479ee5a3a5cbca67e2b558e

[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: ab32c5c136 -s ours am: da4c224221 -s ours am: 7d7b5485e2 -s ours am: 05d441f99a -s ours am: 722f4c8f77 -s ours am: 4b643cc137 -s ours am: 36558998c3 -s ours am: a7db9fa33c -s ours am: c7853827a4 -s ours

am skip reason: subject contains skip directive

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

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