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

Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: b74237e57d

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

Change-Id: I1239509e5bcafae33d2389d7de3e594f1125751b