tree fa202f48c5fb651c43f321c749c4a2268d170bc9
parent a46dbb02704c50bcff83f327563d2690a6628930
parent 6f3ccca004df815cad8328c9fa33d6abafd4c677
author Bill Yi <byi@google.com> 1600494636 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600494636 +0000

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 9c28d5e5f6 am: 6f3ccca004 -s ours

am skip reason: Change-Id Ica89dc1c112fdb6d26ee59355ed06ce32c6e7d40 with SHA-1 a46dbb0270 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/timezonepicker/+/1431518

Change-Id: If0f26940166b8768afdcec5997a3b13cecfaf340