tree e75c5db819c81be521fe2bc6031d007fa5b0914b
parent ff86f033f2afece1363ae06f79a0db21672f8bd8
parent ca05bc8f3cdddf3bdb750256be28f0dfddf10ddf
author TreeHugger Robot <treehugger-gerrit@google.com> 1664170970 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1664170970 +0000

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

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20036878

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