tree 08311dd7bf5342abe0ba76470e4c99a747a271de
parent e868a2ecdcbf4f41fb076c34075518dfd06c9333
parent 8774e9fe40eba69449d9f89e02a00c167e7a85ac
author TreeHugger Robot <treehugger-gerrit@google.com> 1635747028 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1635747028 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 8774e9fe40 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/TvProvider/+/16156196

Change-Id: I31726a7114637f8c734660a92bb2ff45903ae973