tree c36bdc1bb46d0a04443ad7fa1e07eb1de8f266b2
parent c576f7a90d3ba5de8fc90f85be7bed55afb07869
parent f901b2a776ae8f4065e6f55500a652fd21a8654f
author Xin Li <delphij@google.com> 1599795218 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795218 +0000

[automerger skipped] Merge Android R am: 4dbc1203a9 -s ours am: 4ea7426a1b -s ours am: f901b2a776 -s ours

am skip reason: Change-Id I3c6248f1992b2d2eb1df18f1af5f75a68f8dbc16 with SHA-1 555a4df687 is in history

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

Change-Id: I000f44252efab2410c0290bd8313f0fe6a36e106