tree 885fe90f5efc1e4bc8a8798f626cb5ceedf317ed
parent cad849987e35bb916ac71d741904156948321364
parent 872b2008ae0077934b5bc5ef4183dd1f00655f79
author TreeHugger Robot <treehugger-gerrit@google.com> 1658543399 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1658543399 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 872b2008ae -s ours

am skip reason: subject contains skip directive

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

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