tree 1664b2924e4da9b8c639ec84eab20bc68569e38e
parent 58f532de9e64aaee000da559a7cbfb35de9f5ffb
parent 8a7cf265b6a3f9ee9e163f7784629b59222064df
author Treehugger Robot <treehugger-gerrit@google.com> 1648451795 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648451795 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5ed287b409 -s ours am: cac2ca6a8d -s ours am: 8a7cf265b6 -s ours

am skip reason: subject contains skip directive

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

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