tree b97d703b79aa2d0d0e3edf85e0e0948fbe8578df
parent 3a719a102bb2ccd0830aac7f3c5e777c7e559517
parent 0b95dacb300b7fd257cba4d9eacfba449f2e7344
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638448194 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638448194 +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 skip reason: subject contains skip directive

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

Change-Id: I802086addaca4cc91d8fe7827bf0d6e7b6a434dc