tree 1664b2924e4da9b8c639ec84eab20bc68569e38e
parent 642ab6c5695422754b6c3ebd1db6a9a1d81ad22d
parent 9016db29618fb5d6d62255847ed3b9a5dd404709
author Bill Yi <byi@google.com> 1662330022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1662330022 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d74609fdcc -s ours am: 0c0bd285dd -s ours am: 795b325cb4 -s ours am: 9016db2961 -s ours

am skip reason: subject contains skip directive

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

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