commit c71880793fe265439a8c8a23a17b99d714355ddf
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 25 01:07:09 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 25 01:07:09 2022 +0000
tree bbb10369d1280c7065f323b36254943e3f6854c1
parent 73b8bf03441b1d50c278ee72fc541bb50b00bce6
parent 9d97e6d40f4dc2049d457eea7bf3cca597c8fe97

[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: ae6f6819c5 -s ours am: 9d97e6d40f -s ours

am skip reason: subject contains skip directive

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

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