commit 552524028f80aa9126d60c75e5a71892ab103444
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 25 01:07:22 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 25 01:07:22 2022 +0000
tree bbb10369d1280c7065f323b36254943e3f6854c1
parent 5f838e8d7b688953361c4533fb4d9800b1129a74
parent aeb9aba5e5c187646992c327fe43ceff99e70151

[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: 422cc690b7 -s ours am: aeb9aba5e5 -s ours

am skip reason: subject contains skip directive

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

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