tree ffb122974b94d98f1ac691558e2f07fe266005a1
parent b2865952cce456b7e871b45090e246942b5d22b2
parent d403c382050c92c54d4161668c01039f5d8acc97
author Almaz Mingaleev <mingaleev@google.com> 1638446320 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638446320 +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 skip reason: subject contains skip directive

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

Change-Id: Ia21af007fb42bb92abe97a95bd90b5a1f5bc6b91