tree b97d703b79aa2d0d0e3edf85e0e0948fbe8578df
parent fc88593e9a9c0e9f2829665c84b8d0f01b8364d3
parent b581c91347e579ac65cafe45f38d0db20b726ac2
author Almaz Mingaleev <mingaleev@google.com> 1638450146 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638450146 +0000

[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours am: 2fc56ad728 -s ours am: 3c4d8821e4 -s ours am: 0f795e6e20 -s ours am: 14cb7364ee -s ours am: d403c38205 -s ours am: 3d62ab6f07 -s ours am: 869789f3f3 -s ours am: b581c91347 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie42d6202bcc0159e5b958275f6fc57cc862b7949