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

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