tree 45b17cc920472942bcd43ad88a466032027305e5
parent 674a2c7dd896ebba870e3f450b5955d360de3893
parent 1dd591c76ab472ee9e2bbdf3dd205e904cce9d06
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638445373 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638445373 +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 skip reason: subject contains skip directive

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

Change-Id: Id7c8781ef439a9bc86cea1f3af2f56ec1b4aba13