tree b97d703b79aa2d0d0e3edf85e0e0948fbe8578df
parent d270ed6f66de4344389353b829d83a15fc05def2
parent ac8485fc6c534fed87fdea73e73c3a90c39d171a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638448692 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638448692 +0000

Merge "[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" into pie-cts-dev am: 9fb91d6a1a -s ours am: b86f5c7e54 -s ours am: 559f60b0d1 -s ours am: 1dd591c76a -s ours am: 58a510bf97 -s ours am: 0b95dacb30 -s ours am: ac8485fc6c -s ours

am skip reason: subject contains skip directive

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

Change-Id: I927f195f708baf55dbc6b3ed02f37d7830bb4897