tree 3a85022cc09d7ff7cea57d18328ff9eea8858c3e
parent dd7777b230dbcd214f3a7eefa44e452694e36b67
parent 58a510bf9738ecb009c84eefd0f96c50d9540743
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638446316 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638446316 +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 skip reason: subject contains skip directive

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

Change-Id: Ic8c3d1c24d148e4194ee21178c5a3606dec4def3