tree b818e98e89f20fe2d1a250445b7f12807f9a095a
parent 97d198d540b73330c798c8c423c20a59da39813c
parent 23a7c6e6ec7d7c150ae4d85b2b5a94853a406e1c
author TreeHugger Robot <treehugger-gerrit@google.com> 1664703285 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1664703285 +0000

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

am skip reason: subject contains skip directive

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

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