tree 1664b2924e4da9b8c639ec84eab20bc68569e38e
parent 929af8488157b2904496f6f2011ed6654598b0a4
parent d82610b49ea6ce8fa2fc4003c5d05d39807d5239
author TreeHugger Robot <treehugger-gerrit@google.com> 1658548912 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1658548912 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 872b2008ae -s ours am: 4157e09213 -s ours am: 85232b0663 -s ours am: d82610b49e -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: I1f470db8b99c1e2fda30808549ae133cce10c335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>