tree c36bdc1bb46d0a04443ad7fa1e07eb1de8f266b2
parent 60b457aa2c347567e60ed780f20d10cb5d6dd162
parent c68fa6db7fd33edc65f732d1eb571a2fb99f9c3b
author Bill Yi <byi@google.com> 1600502462 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600502462 +0000

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: b9820803f8 am: bed0a2e094 -s ours am: 83ee5b1d2d -s ours am: c68fa6db7f -s ours

am skip reason: Change-Id I52d6cae7d8a17ba9db10eceb8521c1232c09b992 with SHA-1 a8df54082a is in history

Original change: https://android-review.googlesource.com/c/platform/system/timezone/+/1430834

Change-Id: I4d89384e9fd6f470c7500defe007d098ab116ae8