commit a9c2107fee511071c2ac20096da21f5149555ce1
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 24 23:51:25 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 24 23:51:25 2022 +0000
tree b97d703b79aa2d0d0e3edf85e0e0948fbe8578df
parent e63a3c5cea82df29a8676b9fd50b54e61718b96d
parent 0b4cf135e7852c2d2ac63dcbbc224d82ef26c7e1

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

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

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