tree f5cba6c87549b8ba320653ae13c7884f7dca1e96
parent eef84439ef3138801ebee2cc47830154f859253f
parent 7bb7c13814662ce12317a2e444dfac7012e3f2b8
author Xin Li <delphij@google.com> 1598553255 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598553255 +0000

[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 7bb7c13814 -s ours

am skip reason: Change-Id I26966830f706b1ca4d7bfc5a05c1425e03132c0a with SHA-1 e56ef6df6d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12469986

Change-Id: Ie9fb2b34304c127cdd42ceca1cc3ccf3ec8775f4