tree 7a50e78a811a5b791871ef0d99ebff0a10539c53
parent 3e4960b54c1a41ddbb625a9ea2cae7d222d4cdad
parent b06e0df7f22d9ca68da2b8ff78debbd3a0e367ce
author TreeHugger Robot <treehugger-gerrit@google.com> 1626632727 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1626632727 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ebc3c5ce13 -s ours am: c019f4d648 -s ours am: b06e0df7f2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I51c775a273f497bdabc60927e3501e17d12b79a8