tree f2a06f5d94278abe39fcb6eb95caa2a7c0c2a88b
parent 13e2753c0f9baa24ab770b41f4cc20db80b3d684
parent 99d4e29a387afc9fef85d740077b4a95e2ebd8c9
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1593131238 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593131238 +0000

[automerger skipped] [automerger] Merge "Track tzdb 2020a changes [N CTS branch]" into nougat-cts-dev am: 27dfa1af40 am: f940c558b5 am: 7b8e53209f am: 68f384c726 am: 253022fb25 am: 40190e4698 am: e31a931447 -s ours am: 0695b8ab58 -s ours am: f421debad0 -s ours am: 99d4e29a38 -s ours

am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 9b207b42dc is in history

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

Change-Id: I9ccbbe392e194f15e109b69f04952dceaee39fb6