tree 1664b2924e4da9b8c639ec84eab20bc68569e38e
parent 1211b15c74fb4ba815494eca7f0d6e227a49180a
parent f2fe4db511b5e5cf6221225c70b1416d31c3befc
author Bill Yi <byi@google.com> 1658540226 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1658540226 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6ecc274e5 -s ours am: f2fe4db511 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9b4ea12120f88a0c694d6bbb69943571fbb08181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>