tree 2a69d163c5862821e7061a416486acf15b7de1c9
parent a09ebc7ae934e0048a8357ccc88d54477fc60fb7
parent 98f03b36f09a151df2a930c91eb1c14875482e2e
author TreeHugger Robot <treehugger-gerrit@google.com> 1677710879 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1677710879 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1618dd33c9 -s ours am: 1d0cabae5a -s ours am: 243aafc61e -s ours am: 98f03b36f0 -s ours

am skip reason: subject contains skip directive

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

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