tree 1664b2924e4da9b8c639ec84eab20bc68569e38e
parent 4a0e9f0b0e1bea278f553d7775af4324b1559941
parent 248ef8fe827999da33af6edc84d0d6e76ff85528
author Treehugger Robot <treehugger-gerrit@google.com> 1662330032 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1662330032 +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 skip reason: subject contains skip directive

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

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