tree ffb122974b94d98f1ac691558e2f07fe266005a1
parent d1be772f16d110a3ae73f8ea4e99c688b7bd4f35
parent 674a2c7dd896ebba870e3f450b5955d360de3893
author Almaz Mingaleev <mingaleev@google.com> 1638446303 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638446303 +0000

[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on Pacific/Apia DST offset. [P-CTS]" into pie-cts-dev am: aef3dc4fa5 -s ours am: f56d2e6962 -s ours am: 0d242d8580 -s ours am: 512527dc51 -s ours am: 674a2c7dd8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5a89d80e1fd1fdc50d2cb47228fb92b2ac866ff6