tree 1664b2924e4da9b8c639ec84eab20bc68569e38e
parent 7b27da69b663ff518f261caae67bf8ef07ec34fd
parent 8bb10305ce9fcd3f137eebf7539a2a1eea272e3b
author TreeHugger Robot <treehugger-gerrit@google.com> 1658557117 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1658557117 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 9d6b40a47d -s ours am: 8bb10305ce -s ours

am skip reason: subject contains skip directive

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

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