commit 355e6ca4de4cd443b3c070c362ca8f6e9beaabc0
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 25 01:43:05 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 25 01:43:05 2022 +0000
tree bbb10369d1280c7065f323b36254943e3f6854c1
parent a5c3db5c74a871baa9c34654da3844bffbc656ee
parent e5e9e1bae9e971be5963191b475dee27b789e27d

[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: f71c7b74c7 -s ours am: d09876845c -s ours am: cf185107ec -s ours am: e5e9e1bae9 -s ours

am skip reason: subject contains skip directive

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

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