tree c36bdc1bb46d0a04443ad7fa1e07eb1de8f266b2
parent a8df54082a4824a2fa9221e3a1dfbca7f1ccf2a4
parent bed0a2e0946987d3fd060269e95172f140c08615
author Bill Yi <byi@google.com> 1600494633 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600494633 +0000

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: b9820803f8 am: bed0a2e094 -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: If3caf09bf6ac08b824ebe975b0aac4355fc85cef