tree 885fe90f5efc1e4bc8a8798f626cb5ceedf317ed
parent c62fca591eb50a71b084b00bee83bef96e4ce0fb
parent 5d4029790c71cc8e5c7ff22ba3428e9556087eb7
author Treehugger Robot <treehugger-gerrit@google.com> 1662332444 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1662332444 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3c72af6cd8 -s ours am: b631e42a87 -s ours am: c9300600da -s ours am: 248ef8fe82 -s ours am: 5d4029790c -s ours

am skip reason: subject contains skip directive

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

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