tree b97d703b79aa2d0d0e3edf85e0e0948fbe8578df
parent d71c8cca92ee9c080b1a536716ea9396d356deec
parent 3a719a102bb2ccd0830aac7f3c5e777c7e559517
author Almaz Mingaleev <mingaleev@google.com> 1638448680 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638448680 +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: dd7777b230 -s ours am: 3a719a102b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie5557c301101c36fa81145617954ac4860ebff91