tree bc344ca3bd499d83b5484c150ae8407385c84751
parent 45feff11dbfc209d3eb59efa058dc915748762bf
parent dc34c4b7ffd32aab2638adee52ffe71c3a62e4b7
author Treehugger Robot <treehugger-gerrit@google.com> 1670184860 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670184860 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7eb2df7e1e -s ours am: bd259e4266 -s ours am: dc34c4b7ff -s ours

am skip reason: subject contains skip directive

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

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